The patch titled Subject: coredump: prevent double-free on an error path in core dumper has been added to the -mm tree. Its filename is coredump-prevent-double-free-on-an-error-path-in-core-dumper.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Denys Vlasenko <vda.linux@xxxxxxxxxxxxxx> Subject: coredump: prevent double-free on an error path in core dumper In !CORE_DUMP_USE_REGSET case, if elf_note_info_init fails to allocate memory for info->fields, it frees already allocated stuff and returns error to its caller, fill_note_info. Which in turn returns error to its caller, elf_core_dump. Which jumps to cleanup label and calls free_note_info, which will happily try to free all info->fields again. BOOM. This is the fix. Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx> Signed-off-by: Denys Vlasenko <vda.linux@xxxxxxxxxxxxxx> Cc: Venu Byravarasu <vbyravarasu@xxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/binfmt_elf.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff -puN fs/binfmt_elf.c~coredump-prevent-double-free-on-an-error-path-in-core-dumper fs/binfmt_elf.c --- a/fs/binfmt_elf.c~coredump-prevent-double-free-on-an-error-path-in-core-dumper +++ a/fs/binfmt_elf.c @@ -1695,30 +1695,19 @@ static int elf_note_info_init(struct elf return 0; info->psinfo = kmalloc(sizeof(*info->psinfo), GFP_KERNEL); if (!info->psinfo) - goto notes_free; + return 0; info->prstatus = kmalloc(sizeof(*info->prstatus), GFP_KERNEL); if (!info->prstatus) - goto psinfo_free; + return 0; info->fpu = kmalloc(sizeof(*info->fpu), GFP_KERNEL); if (!info->fpu) - goto prstatus_free; + return 0; #ifdef ELF_CORE_COPY_XFPREGS info->xfpu = kmalloc(sizeof(*info->xfpu), GFP_KERNEL); if (!info->xfpu) - goto fpu_free; + return 0; #endif return 1; -#ifdef ELF_CORE_COPY_XFPREGS - fpu_free: - kfree(info->fpu); -#endif - prstatus_free: - kfree(info->prstatus); - psinfo_free: - kfree(info->psinfo); - notes_free: - kfree(info->notes); - return 0; } static int fill_note_info(struct elfhdr *elf, int phdrs, _ Patches currently in -mm which might be from vda.linux@xxxxxxxxxxxxxx are lib-vsprintf-optimize-division-by-10-for-small-integers.patch lib-vsprintf-optimize-division-by-10000.patch lib-vsprintf-optimize-put_dec_trunc8.patch lib-vsprintf-fix-broken-comments.patch coredump-prevent-double-free-on-an-error-path-in-core-dumper.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html