[PATCH][STABLE] audit: correct AUDIT_GET_FEATURE return message type

[PATCH][STABLE] audit: correct AUDIT_GET_FEATURE return message type

[Richard Guy Briggs]

When an AUDIT_GET_FEATURE message is sent from userspace to the kernel, it
should reply with a message tagged as an AUDIT_GET_FEATURE type with a struct
audit_feature.  The current reply is a message tagged as an AUDIT_GET
type with a struct audit_feature.

This appears to have been a cut-and-paste-eo in commit b0fed40.

Reported-by: Steve Grubb <sgrubb@redhat.com>
Cc: stable@vger.kernel.org # v3.13-rc1
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
 kernel/audit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index d20f00f..3a80abb 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -724,7 +724,7 @@ static int audit_get_feature(struct sk_buff *skb)
 
 	seq = nlmsg_hdr(skb)->nlmsg_seq;
 
-	audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &af, sizeof(af));
+	audit_send_reply(skb, seq, AUDIT_GET_FEATURE, 0, 0, &af, sizeof(af));
 
 	return 0;
 }
-- 
1.7.1

- RGB

--
Richard Guy Briggs <rbriggs@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545

Re: [PATCH][STABLE] audit: correct AUDIT_GET_FEATURE return message type

[Paul Moore]

On Wednesday, October 29, 2014 09:35:06 AM Richard Guy Briggs wrote:
> When an AUDIT_GET_FEATURE message is sent from userspace to the kernel, it
> should reply with a message tagged as an AUDIT_GET_FEATURE type with a
> struct audit_feature.  The current reply is a message tagged as an
> AUDIT_GET type with a struct audit_feature.
> 
> This appears to have been a cut-and-paste-eo in commit b0fed40.
> 
> Reported-by: Steve Grubb <sgrubb@redhat.com>
> Cc: stable@vger.kernel.org # v3.13-rc1
> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> ---
>  kernel/audit.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Paul Moore <paul@paul-moore.com>

> diff --git a/kernel/audit.c b/kernel/audit.c
> index d20f00f..3a80abb 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -724,7 +724,7 @@ static int audit_get_feature(struct sk_buff *skb)
> 
>  	seq = nlmsg_hdr(skb)->nlmsg_seq;
> 
> -	audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &af, sizeof(af));
> +	audit_send_reply(skb, seq, AUDIT_GET_FEATURE, 0, 0, &af, sizeof(af));
> 
>  	return 0;
>  }

-- 
paul moore
www.paul-moore.com

Re: [PATCH][STABLE] audit: correct AUDIT_GET_FEATURE return message type

[Greg KH]

On Wed, Oct 29, 2014 at 09:35:06AM -0400, Richard Guy Briggs wrote:
> When an AUDIT_GET_FEATURE message is sent from userspace to the kernel, it
> should reply with a message tagged as an AUDIT_GET_FEATURE type with a struct
> audit_feature.  The current reply is a message tagged as an AUDIT_GET
> type with a struct audit_feature.
> 
> This appears to have been a cut-and-paste-eo in commit b0fed40.
> 
> Reported-by: Steve Grubb <sgrubb@redhat.com>
> Cc: stable@vger.kernel.org # v3.13-rc1
> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> ---
>  kernel/audit.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Why did you send this directly to stable@vger?  That's not how to get a
patch into the stable kernel trees...

Re: [PATCH][STABLE] audit: correct AUDIT_GET_FEATURE return message type

[Richard Guy Briggs]

On 14/10/29, Greg KH wrote:
> On Wed, Oct 29, 2014 at 09:35:06AM -0400, Richard Guy Briggs wrote:
> > When an AUDIT_GET_FEATURE message is sent from userspace to the kernel, it
> > should reply with a message tagged as an AUDIT_GET_FEATURE type with a struct
> > audit_feature.  The current reply is a message tagged as an AUDIT_GET
> > type with a struct audit_feature.
> > 
> > This appears to have been a cut-and-paste-eo in commit b0fed40.
> > 
> > Reported-by: Steve Grubb <sgrubb@redhat.com>
> > Cc: stable@vger.kernel.org # v3.13-rc1
> > Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> > ---
> >  kernel/audit.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> Why did you send this directly to stable@vger?  That's not how to get a
> patch into the stable kernel trees...

Sorry, you're right.  It should be accepted upstream first.  I'll go
back and make sure that gets done...

- RGB

--
Richard Guy Briggs <rbriggs@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545

Re: [PATCH][STABLE] audit: correct AUDIT_GET_FEATURE return message type

[Richard Guy Briggs]

On 14/10/29, Richard Guy Briggs wrote:
> On 14/10/29, Greg KH wrote:
> > On Wed, Oct 29, 2014 at 09:35:06AM -0400, Richard Guy Briggs wrote:
> > > When an AUDIT_GET_FEATURE message is sent from userspace to the kernel, it
> > > should reply with a message tagged as an AUDIT_GET_FEATURE type with a struct
> > > audit_feature.  The current reply is a message tagged as an AUDIT_GET
> > > type with a struct audit_feature.
> > > 
> > > This appears to have been a cut-and-paste-eo in commit b0fed40.
> > > 
> > > Reported-by: Steve Grubb <sgrubb@redhat.com>
> > > Cc: stable@vger.kernel.org # v3.13-rc1
> > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> > > ---
> > >  kernel/audit.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > Why did you send this directly to stable@vger?  That's not how to get a
> > patch into the stable kernel trees...
> 
> Sorry, you're right.  It should be accepted upstream first.  I'll go
> back and make sure that gets done...

Wait, it is upstream in v3.18-rc1, commit 9ef9151

Forgot the Cc: to stable in that commit log.

> - RGB

- RGB

--
Richard Guy Briggs <rbriggs@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545