|
@@ -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
|