The patch titled fs/exec.c: fix resource leaks and wrong goto's has been added to the -mm tree. Its filename is fs-execc-fix-resource-leaks-and-wrong-gotos.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 *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/exec.c: fix resource leaks and wrong goto's From: WANG Cong <xiyou.wangcong@xxxxxxxxx> When ->load_binary() successed, free_arg_pages() should be called to clean the pages allocated by copy_strings_kernel() within it. And also fixes some wrong goto pathes. Signed-off-by: WANG Cong <wangcong@xxxxxxxxx> Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/exec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff -puN fs/exec.c~fs-execc-fix-resource-leaks-and-wrong-gotos fs/exec.c --- a/fs/exec.c~fs-execc-fix-resource-leaks-and-wrong-gotos +++ a/fs/exec.c @@ -1220,6 +1220,7 @@ int search_binary_handler(struct linux_b if (bprm->file) fput(bprm->file); bprm->file = NULL; + free_arg_pages(bprm); current->did_exec = 1; proc_exec_connector(current); return retval; @@ -1300,15 +1301,15 @@ int do_execve(char * filename, retval = security_bprm_alloc(bprm); if (retval) - goto out; + goto out_mm; retval = prepare_binprm(bprm); if (retval < 0) - goto out; + goto out_sec; retval = copy_strings_kernel(1, &bprm->filename, bprm); if (retval < 0) - goto out; + goto out_sec; bprm->exec = bprm->p; retval = copy_strings(bprm->envc, envp, bprm); @@ -1333,6 +1334,8 @@ int do_execve(char * filename, out: free_arg_pages(bprm); + +out_sec: if (bprm->security) security_bprm_free(bprm); _ Patches currently in -mm which might be from xiyou.wangcong@xxxxxxxxx are uml-fix-inconsistence-due-to-tty_operation-change.patch uml-redo-host-capability-detection-and-disabling.patch uml-tidy-stub-management-code.patch uml-style-fixes.patch uml-hppfs-fixes.patch uml-move-hppfs_kernc-to-hppfsc.patch uml-tidy-ptrace-interface.patch uml-fix-errno-return.patch uml-fix-build-when-slob-is-enabled.patch uml-remove-unused-header.patch uml-fix-bad-ntp-interaction-with-clock.patch uml-use-__spin_lock_unlocked.patch uml-fix-config_raw-dependencies.patch uml-use-div_round_up.patch uml-use-page_size-in-linker-scripts.patch uml-physical-memory-shouldnt-include-initial-stack.patch fs-binfmt_elfc-fix-a-wrong-free.patch cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len.patch arch-um-kernel-irqc-clean-up-some-functions.patch arch-um-kernel-memc-remove-arch_validate.patch uml-make-several-more-things-static.patch fs-execc-export-free_arg_pages.patch fs-execc-fix-resource-leaks-and-wrong-gotos.patch fs-compatc-fix-resource-leaks-and-wrong-gotos.patch fs-binfmt_scriptc-fix-resource-leaks.patch fs-binfmt_em86c-fix-resource-leaks.patch fs-binfmt_miscc-fix-resource-leaks.patch fs-execc-fix-wrong-return-value-of-prepare_binprm.patch fs-binfmt_elfc-fix-wrong-return-values.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