Skip to content

Commit

Permalink
[DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() retu…
Browse files Browse the repository at this point in the history
…rns less than zero

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 <[email protected]>
Signed-off-by: David Teigland <[email protected]>
Signed-off-by: Steven Whitehouse <[email protected]>
  • Loading branch information
Jesper Juhl authored and swhiteho committed Aug 14, 2007
1 parent 01c8cab commit 1a2bf2e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion fs/dlm/member.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1a2bf2e

Please sign in to comment.