Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1a2bf2eefb63a267aea7f3f80d6ac59160e20810
Commit: 1a2bf2eefb63a267aea7f3f80d6ac59160e20810
Parent: 01c8cab25863de007fe8c598d0033919ea8ae65e
Author: Jesper Juhl <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 00:27:43 2007 +0200
Committer: Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Tue Aug 14 10:30:04 2007 +0100
[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 <[EMAIL PROTECTED]>
Signed-off-by: David Teigland <[EMAIL PROTECTED]>
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
