cred: copy_process() should clear child->replacement_session_keyring
authorOleg Nesterov <oleg@redhat.com>
Mon, 9 Apr 2012 19:03:50 +0000 (21:03 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2012 15:20:11 +0000 (08:20 -0700)
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>
kernel/cred.c

index 97b36eeca4c90b51cf9fa0abcd81af72e1dfb715..e70683d9ec32f00bf58a0ea2dc64be2d74fb8415 100644 (file)
@@ -386,6 +386,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
        struct cred *new;
        int ret;
 
+       p->replacement_session_keyring = NULL;
+
        if (
 #ifdef CONFIG_KEYS
                !p->cred->thread_keyring &&