kernel:audit.c Fix warning: variable 'nlh' set but not used
in [Kernel]
|
Prev: [tip:x86/urgent] x86, pat: Proper init of memtype subtree_max_end
Next: DMAENGINE: ste_dma40: only write phy channel config first time
From: Justin P. Mattock on 11 Jun 2010 18:10 On 06/11/2010 02:14 PM, Geert Uytterhoeven wrote: > On Fri, Jun 11, 2010 at 22:41, Justin P. Mattock > <justinmattock(a)gmail.com> wrote: >> Removing dead code(hopefully), fixes a warning > > This is not dead code. NLMSG_NEW() sets up an nlmsg in ab->skb. > If you remove the code, it's no longer initialized. > o.k... this one did confuse me a bit, so at the end I just sent in this one which does remove the function but does not fix the warning of nlh not being used >> when compiling the kernel. >> >> CC kernel/audit.o >> kernel/audit.c: In function 'audit_buffer_alloc': >> kernel/audit.c:1044:19: warning: variable 'nlh' set but not used >> CC kernel/auditfilter.o >> >> Signed-off-by: Justin P. Mattock<justinmattock(a)gmail.com> >> >> --- >> kernel/audit.c | 6 ++---- >> 1 files changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/kernel/audit.c b/kernel/audit.c >> index c71bd26..783d958 100644 >> --- a/kernel/audit.c >> +++ b/kernel/audit.c >> @@ -1041,8 +1041,7 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, >> { >> unsigned long flags; >> struct audit_buffer *ab = NULL; >> - struct nlmsghdr *nlh; >> - >> + >> spin_lock_irqsave(&audit_freelist_lock, flags); >> if (!list_empty(&audit_freelist)) { >> ab = list_entry(audit_freelist.next, >> @@ -1065,8 +1064,7 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, >> if (!ab->skb) >> goto nlmsg_failure; >> >> - nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0); >> - >> + >> return ab; >> >> nlmsg_failure: /* Used by NLMSG_NEW */ > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > if you have any ideas/patches then let me know I can test it out and see. Justin P. Mattock -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Justin P. Mattock on 19 Jun 2010 00:50 > > This is not dead code. NLMSG_NEW() sets up an nlmsg in ab->skb. > If you remove the code, it's no longer initialized. I played around with this code some more, but am still getting confused with nlmsg_new and NLMSG_NEW. if I remove the nlmsghdr struct I can get a clean build without a warning, but still am a bit confused. here is an updated patch let me know if it still needs work.. or if it's legit I can resend this. From 7515a08ba921d3beed33fa5c6b1fbe59cf52e069 Mon Sep 17 00:00:00 2001 From: Justin P. Mattock <justinmattock(a)gmail.com> Date: Fri, 18 Jun 2010 19:44:30 -0700 Subject: [PATCH 4/4] audit Signed-off-by: Justin P. Mattock <justinmattock(a)gmail.com> --- kernel/audit.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index c71bd26..1d51258 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1041,7 +1041,6 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, { unsigned long flags; struct audit_buffer *ab = NULL; - struct nlmsghdr *nlh; spin_lock_irqsave(&audit_freelist_lock, flags); if (!list_empty(&audit_freelist)) { @@ -1065,7 +1064,7 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, if (!ab->skb) goto nlmsg_failure; - nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0); + NLMSG_NEW(ab->skb, 0, 0, type, 0, 0); return ab; -- 1.7.1.rc1.21.gf3bd6 Justin P. Mattock -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Justin P. Mattock on 19 Jun 2010 09:30
On 06/19/2010 01:06 AM, Geert Uytterhoeven wrote: > On Sat, Jun 19, 2010 at 06:45, Justin P. Mattock > <justinmattock(a)gmail.com> wrote: >>> This is not dead code. NLMSG_NEW() sets up an nlmsg in ab->skb. >>> If you remove the code, it's no longer initialized. >> >> I played around with this code some more, but am still getting confused with >> nlmsg_new and NLMSG_NEW. if I remove the nlmsghdr struct I can get a clean > > nlmsg_new() allocates a new nlmsg. > NLMSG_NEW() initializes a nlmsg inside an already allocated skbuff. > o.k.. now I see what those two are doing a bit better now nlmsg_new is the start of a netlink messg, and NLMSG_NEW is a new netlink messg thats already been started. >> build without a warning, but still am a bit confused. >> >> here is an updated patch let me know if it still needs work.. >> or if it's legit I can resend this. > > Looks OK to me, thanks! > I'll resend it out with the proper subject, and proper intro to it. >> From 7515a08ba921d3beed33fa5c6b1fbe59cf52e069 Mon Sep 17 00:00:00 2001 >> From: Justin P. Mattock<justinmattock(a)gmail.com> >> Date: Fri, 18 Jun 2010 19:44:30 -0700 >> Subject: [PATCH 4/4] audit >> Signed-off-by: Justin P. Mattock<justinmattock(a)gmail.com> >> >> --- >> kernel/audit.c | 3 +-- >> 1 files changed, 1 insertions(+), 2 deletions(-) >> >> diff --git a/kernel/audit.c b/kernel/audit.c >> index c71bd26..1d51258 100644 >> --- a/kernel/audit.c >> +++ b/kernel/audit.c >> @@ -1041,7 +1041,6 @@ static struct audit_buffer * audit_buffer_alloc(struct >> audit_context *ctx, >> { >> unsigned long flags; >> struct audit_buffer *ab = NULL; >> - struct nlmsghdr *nlh; >> >> spin_lock_irqsave(&audit_freelist_lock, flags); >> if (!list_empty(&audit_freelist)) { >> @@ -1065,7 +1064,7 @@ static struct audit_buffer * audit_buffer_alloc(struct >> audit_context *ctx, >> if (!ab->skb) >> goto nlmsg_failure; >> >> - nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0); >> + NLMSG_NEW(ab->skb, 0, 0, type, 0, 0); >> >> return ab; >> >> -- >> 1.7.1.rc1.21.gf3bd6 > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > thanks for taking the time to look at this. Justin P. Mattock -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |