Merge tag 'Smack-for-5.11' of git://github.com/cschaufler/smack-next (8bda68d6) · Commits · 戴 / test

security/smack/smack_lsm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3870,7 +3870,6 @@ static struct smack_known smack_from_netlbl(const struct sock sk, u16 family,
		struct netlbl_lsm_secattr secattr;
		struct socket_smack *ssp = NULL;
		struct smack_known *skp = NULL;
		int rc;

		netlbl_secattr_init(&secattr);

		@@ -3880,7 +3879,7 @@ static struct smack_known smack_from_netlbl(const struct sock sk, u16 family,
		if (netlbl_skbuff_getattr(skb, family, &secattr) == 0) {
		skp = smack_from_secattr(&secattr, ssp);
		if (secattr.flags & NETLBL_SECATTR_CACHEABLE)
		rc = netlbl_cache_add(skb, family, &skp->smk_netlabel);
		netlbl_cache_add(skb, family, &skp->smk_netlabel);
		}

		netlbl_secattr_destroy(&secattr);

+4 −3

Original line number	Diff line number	Diff line
		@@ -1942,7 +1942,7 @@ static void smk_list_swap_rcu(struct list_head *public,
		* smk_parse_label_list - parse list of Smack labels, separated by spaces
		*
		* @data: the string to parse
		* @private: destination list
		* @list: destination list
		*
		* Returns zero on success or error code, as appropriate
		*/
		@@ -1973,7 +1973,7 @@ static int smk_parse_label_list(char data, struct list_head list)

		/**
		* smk_destroy_label_list - destroy a list of smack_known_list_elem
		* @head: header pointer of the list to destroy
		* @list: header pointer of the list to destroy
		*/
		void smk_destroy_label_list(struct list_head *list)
		{
		@@ -2131,7 +2131,7 @@ static const struct file_operations smk_unconfined_ops = {
		* smk_read_logging - read() for /smack/logging
		* @filp: file pointer, not actually used
		* @buf: where to put the result
		* @cn: maximum to send along
		* @count: maximum to send along
		* @ppos: where to start
		*
		* Returns number of bytes read or error code, as appropriate
		@@ -2272,6 +2272,7 @@ static const struct file_operations smk_load_self_ops = {
		* @buf: data from user space
		* @count: bytes sent
		* @ppos: where to start - must be 0
		* @format: /smack/load or /smack/load2 or /smack/change-rule format.
		*/
		static ssize_t smk_user_access(struct file file, const char __user buf,
		size_t count, loff_t *ppos, int format)