[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1184860108.8765.396.camel@quoit>
Date: Thu, 19 Jul 2007 16:48:28 +0100
From: Steven Whitehouse <swhiteho@...hat.com>
To: Jesper Juhl <jesper.juhl@...il.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
David Teigland <teigland@...hat.com>
Subject: Re: [PATCH] Fix memory leak in dlm_add_member() when
dlm_node_weight() returns less than zero
Hi,
Now in the GFS2 git tree. Thanks,
Steve.
On Thu, 2007-07-19 at 00:27 +0200, Jesper Juhl wrote:
> Greetings,
>
> There's a memory leak in fs/dlm/member.c::dlm_add_member().
>
> If "dlm_node_weight(ls->ls_name, nodeid)" returns < 0, then
> we'll return without freeing the memory allocated to the (at
> that point yet unused) 'memb'.
> This patch frees the allocated memory in that case and thus
> avoids the leak.
>
>
> Signed-off-by: Jesper Juhl <jesper.juhl@...il.com>
> ---
>
> fs/dlm/member.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/fs/dlm/member.c b/fs/dlm/member.c
> index 073599d..d099775 100644
> --- a/fs/dlm/member.c
> +++ b/fs/dlm/member.c
> @@ -56,8 +56,10 @@ static int dlm_add_member(struct dlm_ls *ls, int nodeid)
> return -ENOMEM;
>
> w = dlm_node_weight(ls->ls_name, nodeid);
> - if (w < 0)
> + if (w < 0) {
> + kfree(memb);
> return w;
> + }
>
> memb->nodeid = nodeid;
> memb->weight = w;
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists