diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2012-04-09 21:03:50 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:37:30 +0200 |
| commit | 66174b0e459d78b9bcb77ee37ecff25404f91140 (patch) | |
| tree | 15f0a55ecab2879ddf41f061f73e8dcd22582fab /kernel | |
| parent | 092c87ce9f6c7bba0affc148603c5ef50f03e8fb (diff) | |
cred: copy_process() should clear child->replacement_session_keyring
commit 79549c6dfda0603dba9a70a53467ce62d9335c33 upstream
keyctl_session_to_parent(task) sets ->replacement_session_keyring,
it should be processed and cleared by key_replace_session_keyring().
However, this task can fork before it notices TIF_NOTIFY_RESUME and
the new child gets the bogus ->replacement_session_keyring copied by
dup_task_struct(). This is obviously wrong and, if nothing else, this
leads to put_cred(already_freed_cred).
change copy_creds() to clear this member. If copy_process() fails
before this point the wrong ->replacement_session_keyring doesn't
matter, exit_creds() won't be called.
Cc: <stable@vger.kernel.org>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cred.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 0b5b5fc70e01..9c06d10107c4 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -443,6 +443,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags) mutex_init(&p->cred_guard_mutex); + p->replacement_session_keyring = NULL; + if ( #ifdef CONFIG_KEYS !p->cred->thread_keyring && |