From: Roland McGrath <roland@redhat.com>
Date: Thu, 28 Apr 2005 22:17:19 +0000 (-0700)
Subject: [PATCH] Fix error recovery path for arch_setup_additional_pages
X-Git-Tag: v2.6.12-rc4~182
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c8baff8fe151ea02e00047afc369ee31939e9b;p=linux-2.6

[PATCH] Fix error recovery path for arch_setup_additional_pages

If arch_setup_additional_pages fails, the error path will do some double-frees.
This fixes it.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 6ae62cbf7c..ce9423bb2d 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -945,7 +945,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 	retval = arch_setup_additional_pages(bprm, executable_stack);
 	if (retval < 0) {
 		send_sig(SIGKILL, current, 0);
-		goto out_free_dentry;
+		goto out;
 	}
 #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */