1 files changed, 5 insertions, 6 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 7a9288551d62..3006c1c24304 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1354,10 +1354,12 @@ void setup_new_exec(struct linux_binprm * bprm)
 
         current->sas_ss_sp = current->sas_ss_size = 0;
 
-        if (!bprm->secureexec)
-                set_dumpable(current->mm, SUID_DUMP_USER);
-        else
+        /* Figure out dumpability. */
+        if (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP ||
+            bprm->secureexec)
                 set_dumpable(current->mm, suid_dumpable);
+        else
+                set_dumpable(current->mm, SUID_DUMP_USER);
 
         arch_setup_new_exec();
         perf_event_exec();
@@ -1371,9 +1373,6 @@ void setup_new_exec(struct linux_binprm * bprm)
 
         if (bprm->secureexec) {
                 current->pdeath_signal = 0;
-        } else {
-                if (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)
-                        set_dumpable(current->mm, suid_dumpable);
         }
 
         /* An exec changes our domain. We are no longer part of the thread