Commit 1a2bf2ee authored Jul 19, 2007 by Jesper Juhl Committed by Steven Whitehouse Aug 14, 2007

[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>

parent 01c8cab2

fs/dlm/member.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message