Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next (b2d1965d) · Commits · e / devices / android_kernel_oneplus_sm7250

security/selinux/hooks.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -95,8 +95,6 @@
		#include "audit.h"
		#include "avc_ss.h"

		extern struct security_operations *security_ops;

		/* SECMARK reference count */
		static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);

		@@ -481,6 +479,7 @@ static int sb_finish_set_opts(struct super_block *sb)
		list_entry(sbsec->isec_head.next,
		struct inode_security_struct, list);
		struct inode *inode = isec->inode;
		list_del_init(&isec->list);
		spin_unlock(&sbsec->isec_lock);
		inode = igrab(inode);
		if (inode) {
		@@ -489,7 +488,6 @@ static int sb_finish_set_opts(struct super_block *sb)
		iput(inode);
		}
		spin_lock(&sbsec->isec_lock);
		list_del_init(&isec->list);
		goto next_inode;
		}
		spin_unlock(&sbsec->isec_lock);
		@@ -4727,7 +4725,8 @@ static int selinux_nlmsg_perm(struct sock sk, struct sk_buff skb)
		err = selinux_nlmsg_lookup(sksec->sclass, nlh->nlmsg_type, &perm);
		if (err) {
		if (err == -EINVAL) {
		WARN_ONCE(1, "selinux_nlmsg_perm: unrecognized netlink message:"
		printk(KERN_WARNING
		"SELinux: unrecognized netlink message:"
		" protocol=%hu nlmsg_type=%hu sclass=%hu\n",
		sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);
		if (!selinux_enforcing \|\| security_get_allow_unknown())