Commit 1a2bf2ee authored by Jesper Juhl's avatar Jesper Juhl Committed by Steven Whitehouse

[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: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 01c8cab2
...@@ -56,8 +56,10 @@ static int dlm_add_member(struct dlm_ls *ls, int nodeid) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment