mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
This commit is contained in:
commit
b2d1965dce
1 changed files with 5 additions and 6 deletions
|
@ -95,8 +95,6 @@
|
||||||
#include "audit.h"
|
#include "audit.h"
|
||||||
#include "avc_ss.h"
|
#include "avc_ss.h"
|
||||||
|
|
||||||
extern struct security_operations *security_ops;
|
|
||||||
|
|
||||||
/* SECMARK reference count */
|
/* SECMARK reference count */
|
||||||
static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
|
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,
|
list_entry(sbsec->isec_head.next,
|
||||||
struct inode_security_struct, list);
|
struct inode_security_struct, list);
|
||||||
struct inode *inode = isec->inode;
|
struct inode *inode = isec->inode;
|
||||||
|
list_del_init(&isec->list);
|
||||||
spin_unlock(&sbsec->isec_lock);
|
spin_unlock(&sbsec->isec_lock);
|
||||||
inode = igrab(inode);
|
inode = igrab(inode);
|
||||||
if (inode) {
|
if (inode) {
|
||||||
|
@ -489,7 +488,6 @@ static int sb_finish_set_opts(struct super_block *sb)
|
||||||
iput(inode);
|
iput(inode);
|
||||||
}
|
}
|
||||||
spin_lock(&sbsec->isec_lock);
|
spin_lock(&sbsec->isec_lock);
|
||||||
list_del_init(&isec->list);
|
|
||||||
goto next_inode;
|
goto next_inode;
|
||||||
}
|
}
|
||||||
spin_unlock(&sbsec->isec_lock);
|
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);
|
err = selinux_nlmsg_lookup(sksec->sclass, nlh->nlmsg_type, &perm);
|
||||||
if (err) {
|
if (err) {
|
||||||
if (err == -EINVAL) {
|
if (err == -EINVAL) {
|
||||||
WARN_ONCE(1, "selinux_nlmsg_perm: unrecognized netlink message:"
|
printk(KERN_WARNING
|
||||||
" protocol=%hu nlmsg_type=%hu sclass=%hu\n",
|
"SELinux: unrecognized netlink message:"
|
||||||
sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);
|
" protocol=%hu nlmsg_type=%hu sclass=%hu\n",
|
||||||
|
sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);
|
||||||
if (!selinux_enforcing || security_get_allow_unknown())
|
if (!selinux_enforcing || security_get_allow_unknown())
|
||||||
err = 0;
|
err = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue