Commit 82d0b80a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 98b6ed0f 2976b10f

fs/exec.c

+9 −7
Original line number Diff line number Diff line
@@ -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