diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-13 21:49:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-13 21:49:53 +1100 |
| commit | 09c626892772e6fe03f768b3492fbb126f465fe6 (patch) | |
| tree | e9790399d23ddd6799d129d01eb4096affe5a58b /security | |
| parent | 04689e749b7ec156291446028a0ce2e685bf3855 (diff) | |
| parent | d950f84c1c6658faec2ecbf5b09f7e7191953394 (diff) | |
| download | linux-09c626892772e6fe03f768b3492fbb126f465fe6.tar.gz linux-09c626892772e6fe03f768b3492fbb126f465fe6.tar.bz2 linux-09c626892772e6fe03f768b3492fbb126f465fe6.zip | |
Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index e66314138b38..c603b20356ad 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4725,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; } |