[DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns 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 <jesper.juhl@gmail.com> Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
01c8cab258
commit
1a2bf2eefb
|
@ -56,8 +56,10 @@ static int dlm_add_member(struct dlm_ls *ls, int nodeid)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
w = dlm_node_weight(ls->ls_name, nodeid);
|
w = dlm_node_weight(ls->ls_name, nodeid);
|
||||||
if (w < 0)
|
if (w < 0) {
|
||||||
|
kfree(memb);
|
||||||
return w;
|
return w;
|
||||||
|
}
|
||||||
|
|
||||||
memb->nodeid = nodeid;
|
memb->nodeid = nodeid;
|
||||||
memb->weight = w;
|
memb->weight = w;
|
||||||
|
|
Loading…
Reference in a new issue