From: Richard Guy Briggs Date: Wed, 12 Nov 2014 19:01:34 +0000 (-0500) Subject: selinux: convert WARN_ONCE() to printk() in selinux_nlmsg_perm() X-Git-Tag: v3.16.85~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c46f7a2891110c582a94a807018d231e81eefe;p=thirdparty%2Fkernel%2Fstable.git selinux: convert WARN_ONCE() to printk() in selinux_nlmsg_perm() commit d950f84c1c6658faec2ecbf5b09f7e7191953394 upstream. Convert WARN_ONCE() to printk() in selinux_nlmsg_perm(). After conversion from audit_log() in commit e173fb26, WARN_ONCE() was deemed too alarmist, so switch it to printk(). Signed-off-by: Richard Guy Briggs [PM: Changed to printk(WARNING) so we catch all of the different invalid netlink messages. In Richard's defense, he brought this point up earlier, but I didn't understand his point at the time.] Signed-off-by: Paul Moore Signed-off-by: Ben Hutchings --- diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 7d7631ef938ef..ba090b1ae8eb9 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4683,9 +4683,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; }