exec: Consolidate pdeath_signal clearing

Instead of an additional secureexec check for pdeath_signal, just move it
up into the initial secureexec test. Neither perf nor arch code touches
pdeath_signal, so the relocation shouldn't change anything.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Serge Hallyn <serge@hallyn.com>

diff --git a/fs/exec.c b/fs/exec.c
index 3235cbd85efa7f8db701deebf97f41445e44b95f..01a9fb9d8ac3a332e0e28b79d20ffb9a768b38ba 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1351,6 +1351,9 @@ void setup_new_exec(struct linux_binprm * bprm)
        bprm->secureexec |= bprm->cap_elevated;
 
        if (bprm->secureexec) {
+               /* Make sure parent cannot signal privileged process. */
+               current->pdeath_signal = 0;
+
                /*
                 * For secureexec, reset the stack limit to sane default to
                 * avoid bad behavior from the prior rlimits. This has to
@@ -1383,10 +1386,6 @@ void setup_new_exec(struct linux_binprm * bprm)
         */
        current->mm->task_size = TASK_SIZE;
 
-       if (bprm->secureexec) {
-               current->pdeath_signal = 0;
-       }
-
        /* An exec changes our domain. We are no longer part of the thread
           group */
        current->self_exec_id++;