From f17da0d28eb45cfcae45db4b0fafcc1911f43131 Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Tue, 6 May 2008 12:45:35 +0800 Subject: [PATCH] --- yaml --- r: 96992 b: refs/heads/master c: 5f719558edf9c84bfbb1f7ad37e84c483282d09f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/binfmt_elf.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c42b6e25c392..8c40f8389b80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eceea0b3df05ed262ae32e0c6340cc7a3626632d +refs/heads/master: 5f719558edf9c84bfbb1f7ad37e84c483282d09f diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index b25707fee2cc..bd08332079cf 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/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 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un set_fs(fs); cleanup: - kfree(elf); free_note_info(&info); + kfree(elf); +out: return has_dumped; }