Commit 6899e92d authored Dec 17, 2012 by Alan Cox Committed by Linus Torvalds Dec 17, 2012

binfmt_elf: fix corner case kfree of uninitialized data



If elf_core_dump() is called and fill_note_info() fails in the kmalloc()
then it returns 0 but has not yet initialised all the needed fields.  As a
result we do a kfree(randomness) after correctly skipping the thread data.

[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 323c1260

fs/binfmt_elf.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1601,8 +1601,10 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
		info->thread = NULL;

		psinfo = kmalloc(sizeof(*psinfo), GFP_KERNEL);
		if (psinfo == NULL)
		if (psinfo == NULL) {
		info->psinfo.data = NULL; /* So we don't free this wrongly */
		return 0;
		}

		fill_note(&info->psinfo, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);

Admin message