diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 20:52:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 20:53:10 +0200 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /kernel/exit.c | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
| download | linux-45bd00d31de886f8425b4dd33204b911b0a466a9.tar.bz2 | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 869dc221733e..ae5d8660ddff 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -901,6 +901,8 @@ NORET_TYPE void do_exit(long code) tracehook_report_exit(&code); + validate_creds_for_do_exit(tsk); + /* * We're taking recursive faults here in do_exit. Safest is to just * leave this task alone and wait for reboot. @@ -1009,7 +1011,10 @@ NORET_TYPE void do_exit(long code) if (tsk->splice_pipe) __free_pipe_info(tsk->splice_pipe); + validate_creds_for_do_exit(tsk); + preempt_disable(); + exit_rcu(); /* causes final put_task_struct in finish_task_switch(). */ tsk->state = TASK_DEAD; schedule(); |