diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
| commit | 38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch) | |
| tree | 17742c032f74a953054a99ebc04ee6cd7ead2d9d /fs/exec.c | |
| parent | 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff) | |
| parent | 70a9f8797ce298544cfd07328ff59f00488bc491 (diff) | |
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small fixes, all driver specific. The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 16 |
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 |