[PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero

Greetings,

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

 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 linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • Re: [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
    • From: Steven Whitehouse <[email protected]>
  • Re: [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
    • From: David Teigland <[email protected]>

• Prev by Date: Re: [GIT PULL] FireWire updates
• Next by Date: Re: [PATCH 3/3]x86_64: early_printk for early debug port support
• Previous by thread: [PATCH] Fix "use after free" / "double free" bug in amd_create_gatt_pages / amd_free_gatt_pages
• Next by thread: Re: [PATCH] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]