Skip to content

L
linux
Commit 09c62689 authored by James Morris's avatar James Morris
Browse files
Options

Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus

parents 04689e74 d950f84c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
security/selinux/hooks.c
View file @ 09c62689
...@@ -4725,7 +4725,8 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb) ...@@ -4725,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); 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
"SELinux: unrecognized netlink message:"
" protocol=%hu nlmsg_type=%hu sclass=%hu\n", " protocol=%hu nlmsg_type=%hu sclass=%hu\n",
sk->sk_protocol, nlh->nlmsg_type, sksec->sclass); sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);
if (!selinux_enforcing || security_get_allow_unknown()) if (!selinux_enforcing || security_get_allow_unknown())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7