summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2018-01-02 15:21:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-03 10:13:36 -0800
commite816c201aed5232171f8eb80b5d46ae6516683b9 (patch)
tree9556435912403047091fd26ba95d98cd3e4d26e8 /fs
parent30a7acd573899fd8b8ac39236eff6468b195ac7d (diff)
downloadlinux-stable-e816c201aed5232171f8eb80b5d46ae6516683b9.tar.gz
linux-stable-e816c201aed5232171f8eb80b5d46ae6516683b9.tar.bz2
linux-stable-e816c201aed5232171f8eb80b5d46ae6516683b9.zip
exec: Weaken dumpability for secureexec
This is a logical revert of commit e37fdb785a5f ("exec: Use secureexec for setting dumpability") This weakens dumpability back to checking only for uid/gid changes in current (which is useless), but userspace depends on dumpability not being tied to secureexec. https://bugzilla.redhat.com/show_bug.cgi?id=1528633 Reported-by: Tom Horsley <horsley1953@gmail.com> Fixes: e37fdb785a5f ("exec: Use secureexec for setting dumpability") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 5688b5e1b937..7eb8d21bcab9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1349,9 +1349,14 @@ void setup_new_exec(struct linux_binprm * bprm)
current->sas_ss_sp = current->sas_ss_size = 0;
- /* Figure out dumpability. */
+ /*
+ * Figure out dumpability. Note that this checking only of current
+ * is wrong, but userspace depends on it. This should be testing
+ * bprm->secureexec instead.
+ */
if (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP ||
- bprm->secureexec)
+ !(uid_eq(current_euid(), current_uid()) &&
+ gid_eq(current_egid(), current_gid())))
set_dumpable(current->mm, suid_dumpable);
else
set_dumpable(current->mm, SUID_DUMP_USER);