The patch titled fs/binfmt_script.c: fix resource leaks has been added to the -mm tree. Its filename is fs-binfmt_scriptc-fix-resource-leaks.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/binfmt_script.c: fix resource leaks From: WANG Cong <xiyou.wangcong@xxxxxxxxx> ->load_binary()'s caller only frees resources which ->load_binary() applied when it succeeded, so ->load_binary() itself should free the resources on failure. Signed-off-by: WANG Cong <wangcong@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/binfmt_script.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff -puN fs/binfmt_script.c~fs-binfmt_scriptc-fix-resource-leaks fs/binfmt_script.c --- a/fs/binfmt_script.c~fs-binfmt_scriptc-fix-resource-leaks +++ a/fs/binfmt_script.c @@ -75,11 +75,13 @@ static int load_script(struct linux_binp bprm->argc++; if (i_arg) { retval = copy_strings_kernel(1, &i_arg, bprm); - if (retval < 0) return retval; + if (retval < 0) + goto out; bprm->argc++; } retval = copy_strings_kernel(1, &i_name, bprm); - if (retval) return retval; + if (retval) + goto out; bprm->argc++; bprm->interp = interp; @@ -87,14 +89,26 @@ static int load_script(struct linux_binp * OK, now restart the process with the interpreter's dentry. */ file = open_exec(interp); - if (IS_ERR(file)) - return PTR_ERR(file); + if (IS_ERR(file)) { + retval = PTR_ERR(file); + goto out; + } bprm->file = file; retval = prepare_binprm(bprm); - if (retval < 0) - return retval; + if (retval < 0) { + if (bprm->file) { + allow_write_access(bprm->file); + fput(bprm->file); + } + goto out; + } + return search_binary_handler(bprm,regs); + +out: + free_arg_pages(bprm); + return retval; } static struct linux_binfmt script_format = { _ 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