commit 5f719558edf9c84bfbb1f7ad37e84c483282d09f
author WANG Cong <xiyou.wangcong@gmail.com> Tue May 06 12:45:35 2008 +0800
committer Al Viro <viro@zeniv.linux.org.uk> Fri May 16 17:22:58 2008 -0400
tree acbd9ec7343ad6d7933015c40b0acf378a2d2418
parent eceea0b3df05ed262ae32e0c6340cc7a3626632d

[Patch] fs/binfmt_elf.c: fix a wrong free

In kmalloc failing path, we shouldn't free pointers in 'info',
because the struct 'info' is uninitilized when kmalloc is called.

And when kmalloc returns NULL, it's needless to kfree it.

Signed-off-by: WANG Cong <wangcong@zeuux.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>

--
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index b25707f..bd08332 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1900,7 +1900,7 @@
 	/* alloc memory for large data structures: too large to be on stack */
 	elf = kmalloc(sizeof(*elf), GFP_KERNEL);
 	if (!elf)
-		goto cleanup;
+		goto out;
 	
 	segs = current->mm->map_count;
 #ifdef ELF_CORE_EXTRA_PHDRS
@@ -2034,8 +2034,9 @@
 	set_fs(fs);
 
 cleanup:
-	kfree(elf);
 	free_note_info(&info);
+	kfree(elf);
+out:
 	return has_dumped;
 }