diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-12-04 22:49:14 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-12-04 22:49:14 +0100 |
| commit | b2d1965dcea148100ffc4e7199470bf5fad13871 (patch) | |
| tree | f7ccbc1b4c36c0ceb446122f17958a23ff0b2bbf /security/selinux | |
| parent | Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel in... (diff) | |
| parent | selinux: Remove security_ops extern (diff) | |
| download | linux-b2d1965dcea148100ffc4e7199470bf5fad13871.tar.xz linux-b2d1965dcea148100ffc4e7199470bf5fad13871.zip | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/hooks.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 29e64d4ca099..49fc8338bcc7 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -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 @@ next_inode: 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 @@ next_inode: iput(inode); } spin_lock(&sbsec->isec_lock); - list_del_init(&isec->list); goto next_inode; } spin_unlock(&sbsec->isec_lock); @@ -4727,9 +4725,10 @@ 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:" - " protocol=%hu nlmsg_type=%hu sclass=%hu\n", - sk->sk_protocol, nlh->nlmsg_type, sksec->sclass); + 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()) err = 0; } |