diff --git a/[refs] b/[refs] index 9dcfdf0e80df..b8062c6c3c70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dea649b8ac1861107c5d91e1a71121434fc64193 +refs/heads/master: f23ca335462e3c84f13270b9e65f83936068ec2c diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index da013853a622..17c6c929ee94 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1357,8 +1357,6 @@ struct task_struct { * credentials (COW) */ const struct cred __rcu *cred; /* effective (overridable) subjective task * credentials (COW) */ - struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */ - char comm[TASK_COMM_LEN]; /* executable name excluding path - access with [gs]et_task_comm (which lock it with task_lock()) diff --git a/trunk/kernel/cred.c b/trunk/kernel/cred.c index 430557ea488f..de728ac50d82 100644 --- a/trunk/kernel/cred.c +++ b/trunk/kernel/cred.c @@ -207,13 +207,6 @@ void exit_creds(struct task_struct *tsk) validate_creds(cred); alter_cred_subscribers(cred, -1); put_cred(cred); - - cred = (struct cred *) tsk->replacement_session_keyring; - if (cred) { - tsk->replacement_session_keyring = NULL; - validate_creds(cred); - put_cred(cred); - } } /** @@ -396,8 +389,6 @@ 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 &&