diff --git a/[refs] b/[refs] index 90e444031a64..4ed7a0778d9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f29fae29709b4668979e244c09b2fa78ff1ad59 +refs/heads/master: 39c9aede2b4a252bd296c0a86be832c3d3d0a273 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index f71de5a64d0c..7fd4de46b2a9 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -4395,7 +4395,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb) "SELinux: unrecognized netlink message" " type=%hu for sclass=%hu\n", nlh->nlmsg_type, isec->sclass); - if (!selinux_enforcing) + if (!selinux_enforcing || security_get_allow_unknown()) err = 0; }