summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-29 10:26:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-29 10:26:50 -0700
commit82d0b80ad6346cee3200b7c7bb1fc975481b7703 (patch)
treea1e8b5ac321e1f46c389549f3b978a7681feb631
parent98b6ed0f2bf4abfb759206aa70690636372bdee7 (diff)
parent2976b10f05bd7f6dab9f9e7524451ddfed656a89 (diff)
downloadlinux-3.10-82d0b80ad6346cee3200b7c7bb1fc975481b7703.tar.gz
linux-3.10-82d0b80ad6346cee3200b7c7bb1fc975481b7703.tar.bz2
linux-3.10-82d0b80ad6346cee3200b7c7bb1fc975481b7703.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Ingo Molnar: "One more fix for a recently discovered bug" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Disable monitoring on setuid processes for regular users
-rw-r--r--fs/exec.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 64301958557..ffd7a813ad3 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1135,13 +1135,6 @@ void setup_new_exec(struct linux_binprm * bprm)
set_dumpable(current->mm, suid_dumpable);
}
- /*
- * Flush performance counters when crossing a
- * security domain:
- */
- if (!get_dumpable(current->mm))
- perf_event_exit_task(current);
-
/* An exec changes our domain. We are no longer part of the thread
group */
@@ -1205,6 +1198,15 @@ void install_exec_creds(struct linux_binprm *bprm)
commit_creds(bprm->cred);
bprm->cred = NULL;
+
+ /*
+ * Disable monitoring for regular users
+ * when executing setuid binaries. Must
+ * wait until new credentials are committed
+ * by commit_creds() above
+ */
+ if (get_dumpable(current->mm) != SUID_DUMP_USER)
+ perf_event_exit_task(current);
/*
* cred_guard_mutex must be held at least to this point to prevent
* ptrace_attach() from altering our determination of the task's