* [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
@ 2007-07-18 22:27 Jesper Juhl
2007-07-19 13:20 ` David Teigland
2007-07-19 15:48 ` Steven Whitehouse
0 siblings, 2 replies; 3+ messages in thread
From: Jesper Juhl @ 2007-07-18 22:27 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: David Teigland, Jesper Juhl
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@gmail.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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
2007-07-18 22:27 [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero Jesper Juhl
@ 2007-07-19 13:20 ` David Teigland
2007-07-19 15:48 ` Steven Whitehouse
1 sibling, 0 replies; 3+ messages in thread
From: David Teigland @ 2007-07-19 13:20 UTC (permalink / raw)
To: Jesper Juhl; +Cc: Linux Kernel Mailing List
On Thu, Jul 19, 2007 at 12:27:43AM +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.
Yep, thanks.
Dave
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
2007-07-18 22:27 [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero Jesper Juhl
2007-07-19 13:20 ` David Teigland
@ 2007-07-19 15:48 ` Steven Whitehouse
1 sibling, 0 replies; 3+ messages in thread
From: Steven Whitehouse @ 2007-07-19 15:48 UTC (permalink / raw)
To: Jesper Juhl; +Cc: Linux Kernel Mailing List, David Teigland
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@gmail.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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-19 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-18 22:27 [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero Jesper Juhl
2007-07-19 13:20 ` David Teigland
2007-07-19 15:48 ` Steven Whitehouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox