diff options
| author | James Morris <jmorris@namei.org> | 2009-09-11 00:04:49 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-11 00:04:49 +0200 |
| commit | a3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch) | |
| tree | 530c5bdbc534618311dab3e0af245835af56db0f /kernel/fork.c | |
| parent | Linux 2.6.31 (diff) | |
| parent | binfmt_elf: fix PT_INTERP bss handling (diff) | |
| download | linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.tar.xz linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index e6c04d462ab2..aab8579c6093 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -152,8 +152,7 @@ void __put_task_struct(struct task_struct *tsk) WARN_ON(atomic_read(&tsk->usage)); WARN_ON(tsk == current); - put_cred(tsk->real_cred); - put_cred(tsk->cred); + exit_creds(tsk); delayacct_tsk_free(tsk); if (!profile_handoff_task(tsk)) @@ -1297,8 +1296,7 @@ bad_fork_cleanup_put_domain: module_put(task_thread_info(p)->exec_domain->module); bad_fork_cleanup_count: atomic_dec(&p->cred->user->processes); - put_cred(p->real_cred); - put_cred(p->cred); + exit_creds(p); bad_fork_free: free_task(p); fork_out: |