[PATCH 2/6]kernel:audit.c Fix warning: variable 'nlh' set but not used

[Geert Uytterhoeven]

On Sat, Jun 19, 2010 at 06:45, Justin P. Mattock
<justinmattock at 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.

> 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!

> From 7515a08ba921d3beed33fa5c6b1fbe59cf52e069 Mon Sep 17 00:00:00 2001
> From: Justin P. Mattock <justinmattock at gmail.com>
> Date: Fri, 18 Jun 2010 19:44:30 -0700
> Subject: [PATCH 4/4] audit
>  Signed-off-by: Justin P. Mattock <justinmattock at 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 at 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