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

09c62689 · James Morris · 04689e74 · d950f84c · 09c62689
Commit 09c62689 authored Nov 13, 2014 by James Morris
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

security/selinux/hooks.c security/selinux/hooks.c +4 -3

No files found.
--- 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:"
+			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())
 				err = 0;
 		}