linux-kernel - Re: [Patch] fs/binfmt

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20080504143011.GB3720@hack>
Date:	Sun, 4 May 2008 22:30:11 +0800
From:	WANG Cong <xiyou.wangcong@...il.com>
To:	Pekka Enberg <penberg@...helsinki.fi>
Cc:	WANG Cong <xiyou.wangcong@...il.com>,
	LKML <linux-kernel@...r.kernel.org>,
	Eric Youngdale <ericy@...s.com>, viro@...iv.linux.org.uk,
	linux-fsdevel@...r.kernel.org, Andrew Morton <akpm@...l.org>
Subject: Re: [Patch] fs/binfmt_elf.c: fix a wrong free

On Sun, May 04, 2008 at 01:39:03PM +0300, Pekka Enberg wrote:

> Looks good although 'ret' is usually reserved for the variable that 
> contains the return value so you might want to consider using the more 
> idiomatic 'out' as the label name.
>

Thanks. Done.

---
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index f6d5a9d..357b503 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1900,7 +1900,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
 	/* 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 @@ end_coredump:
 	set_fs(fs);
 
 cleanup:
-	kfree(elf);
 	free_note_info(&info);
+	kfree(elf);
+out:
 	return has_dumped;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/