From a559a67e47b5dd841ff9391c0f7870e90f677e38 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Mon, 9 Apr 2012 21:03:50 +0200 Subject: [PATCH] --- yaml --- r: 298920 b: refs/heads/master c: 79549c6dfda0603dba9a70a53467ce62d9335c33 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/cred.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a02e861692a3..92613dd32613 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 923e9a1399b620d063cd88537c64561bc3d5f905 +refs/heads/master: 79549c6dfda0603dba9a70a53467ce62d9335c33 diff --git a/trunk/kernel/cred.c b/trunk/kernel/cred.c index 97b36eeca4c9..e70683d9ec32 100644 --- a/trunk/kernel/cred.c +++ b/trunk/kernel/cred.c @@ -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 &&