From b9fa31d38fc897e05344a606a02d18ec3535d620 Mon Sep 17 00:00:00 2001 From: Richard Guy Briggs Date: Wed, 12 Nov 2014 14:01:34 -0500 Subject: [PATCH] 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 Signed-off-by: Kevin F. Haggerty Change-Id: Ic6cfed3718514c7321006e5a15d87eef4d505d79 --- security/selinux/hooks.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index eb5d6a6c62a..6e5fdb8e338 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4774,9 +4774,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); #ifdef CONFIG_ALWAYS_ENFORCE if (security_get_allow_unknown()) #else