public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Moore <pmoore@redhat.com>
To: Richard Guy Briggs <rgb@redhat.com>
Cc: linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov,
	linux-audit@redhat.com, linux-kernel@vger.kernel.org,
	eparis@redhat.com, sgrubb@redhat.com
Subject: Re: [PATCH] selinux: hooks: cleanup orphan keywords in audit log text
Date: Mon, 22 Sep 2014 15:55:08 -0400	[thread overview]
Message-ID: <1456449.0ADpScPp6d@sifl> (raw)
In-Reply-To: <8bedc57ef45bf628ac344bc3d8513b9a93e274ca.1411087339.git.rgb@redhat.com>

On Thursday, September 18, 2014 08:50:17 PM Richard Guy Briggs wrote:
> Convert audit_log() call to WARN_ONCE().
>
> Rename "type=" to nlmsg_type=" to avoid confusion with the audit record
> type.
> 
> Added "protocol=" to help track down which protocol (NETLINK_AUDIT?) was
> used within the netlink protocol family.
> 
> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> ---
>  security/selinux/hooks.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)

I rewrote the patch subject line as it doesn't really make much sense given 
the changes made by the patch, but other than that it looks fine to me.

Applied.
 
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 83d06db..28ec61c 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -4681,10 +4681,9 @@ 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) {
> -			audit_log(current->audit_context, GFP_KERNEL, 
AUDIT_SELINUX_ERR,
> -				  "SELinux:  unrecognized netlink message"
> -				  " type=%hu for sclass=%hu\n",
> -				  nlh->nlmsg_type, sksec->sclass);
> +			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);
>  			if (!selinux_enforcing || security_get_allow_unknown())
>  				err = 0;
>  		}

-- 
paul moore
security and virtualization @ redhat


  reply	other threads:[~2014-09-22 19:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-19  0:50 [PATCH] selinux: hooks: cleanup orphan keywords in audit log text Richard Guy Briggs
2014-09-22 19:55 ` Paul Moore [this message]
2014-09-22 20:59   ` Richard Guy Briggs
2014-09-22 21:25     ` Paul Moore

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1456449.0ADpScPp6d@sifl \
    --to=pmoore@redhat.com \
    --cc=eparis@redhat.com \
    --cc=linux-audit@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=rgb@redhat.com \
    --cc=selinux@tycho.nsa.gov \
    --cc=sgrubb@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox