handle suicide on late failure exits in execve() in search_binary_handler()

... rather than doing that in the guts of ->load_binary().
[updated to fix the bug spotted by Shentino - for SIGSEGV we really need
something stronger than send_sig_info(); again, better do that in one place]

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 8 insertions, 16 deletions

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index fe2a643ee005..d3634bfb7fe1 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -317,8 +317,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
                 goto error;
 
         /* there's now no turning back... the old userspace image is dead,
-         * defunct, deceased, etc. after this point we have to exit via
-         * error_kill */
+         * defunct, deceased, etc.
+         */
         set_personality(PER_LINUX_FDPIC);
         if (elf_read_implies_exec(&exec_params.hdr, executable_stack))
                 current->personality |= READ_IMPLIES_EXEC;
@@ -343,24 +343,22 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
 
         retval = setup_arg_pages(bprm, current->mm->start_stack,
                                  executable_stack);
-        if (retval < 0) {
-                send_sig(SIGKILL, current, 0);
-                goto error_kill;
-        }
+        if (retval < 0)
+                goto error;
 #endif
 
         /* load the executable and interpreter into memory */
         retval = elf_fdpic_map_file(&exec_params, bprm->file, current->mm,
                                     "executable");
         if (retval < 0)
-                goto error_kill;
+                goto error;
 
         if (interpreter_name) {
                 retval = elf_fdpic_map_file(&interp_params, interpreter,
                                             current->mm, "interpreter");
                 if (retval < 0) {
                         printk(KERN_ERR "Unable to load interpreter\n");
-                        goto error_kill;
+                        goto error;
                 }
 
                 allow_write_access(interpreter);
@@ -397,7 +395,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
         if (IS_ERR_VALUE(current->mm->start_brk)) {
                 retval = current->mm->start_brk;
                 current->mm->start_brk = 0;
-                goto error_kill;
+                goto error;
         }
 
         current->mm->brk = current->mm->start_brk;
@@ -410,7 +408,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
         install_exec_creds(bprm);
         if (create_elf_fdpic_tables(bprm, current->mm,
                                     &exec_params, &interp_params) < 0)
-                goto error_kill;
+                goto error;
 
         kdebug("- start_code  %lx", current->mm->start_code);
         kdebug("- end_code    %lx", current->mm->end_code);
@@ -449,12 +447,6 @@ error:
         kfree(interp_params.phdrs);
         kfree(interp_params.loadmap);
         return retval;
-
-        /* unrecoverable error - kill the process */
-error_kill:
-        send_sig(SIGSEGV, current, 0);
-        goto error;
-
 }
 
 /*****************************************************************************/