Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c54396e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull SELinux fixlet from James Morris:
 "WARN_ONCE() here will unnecessarily terrify users"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: convert WARN_ONCE() to printk() in selinux_nlmsg_perm()
parents 91188375 09c62689

security/selinux/hooks.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -4725,7 +4725,8 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb) 
	err = selinux_nlmsg_lookup(sksec->sclass, nlh->nlmsg_type, &perm);

	err = selinux_nlmsg_lookup(sksec->sclass, nlh->nlmsg_type, &perm);

	if (err) {

	if (err) {

		if (err == -EINVAL) {

		if (err == -EINVAL) {

			WARN_ONCE(1, "selinux_nlmsg_perm: unrecognized netlink message:"

			printk(KERN_WARNING

			       "SELinux: unrecognized netlink message:"

			       " protocol=%hu nlmsg_type=%hu sclass=%hu\n",

			       " protocol=%hu nlmsg_type=%hu sclass=%hu\n",

			       sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);

			       sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);

			if (!selinux_enforcing || security_get_allow_unknown())

			if (!selinux_enforcing || security_get_allow_unknown())