diff options
author | Oleg Nesterov <oleg@redhat.com> | 2012-05-10 20:59:09 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 22:11:41 -0400 |
commit | f23ca335462e3c84f13270b9e65f83936068ec2c (patch) | |
tree | f0df939f9906c28267c930554223720a82241c71 | |
parent | dea649b8ac1861107c5d91e1a71121434fc64193 (diff) |
keys: kill task_struct->replacement_session_keyring
Kill the no longer used task_struct->replacement_session_keyring, update
copy_creds() and exit_creds().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alexander Gordeev <agordeev@redhat.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: David Smith <dsmith@redhat.com>
Cc: "Frank Ch. Eigler" <fche@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Larry Woodman <lwoodman@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | include/linux/sched.h | 2 | ||||
-rw-r--r-- | kernel/cred.c | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index da013853a62..17c6c929ee9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1357,8 +1357,6 @@ struct task_struct { | |||
1357 | * credentials (COW) */ | 1357 | * credentials (COW) */ |
1358 | const struct cred __rcu *cred; /* effective (overridable) subjective task | 1358 | const struct cred __rcu *cred; /* effective (overridable) subjective task |
1359 | * credentials (COW) */ | 1359 | * credentials (COW) */ |
1360 | struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */ | ||
1361 | |||
1362 | char comm[TASK_COMM_LEN]; /* executable name excluding path | 1360 | char comm[TASK_COMM_LEN]; /* executable name excluding path |
1363 | - access with [gs]et_task_comm (which lock | 1361 | - access with [gs]et_task_comm (which lock |
1364 | it with task_lock()) | 1362 | it with task_lock()) |
diff --git a/kernel/cred.c b/kernel/cred.c index 430557ea488..de728ac50d8 100644 --- a/kernel/cred.c +++ b/kernel/cred.c | |||
@@ -207,13 +207,6 @@ void exit_creds(struct task_struct *tsk) | |||
207 | validate_creds(cred); | 207 | validate_creds(cred); |
208 | alter_cred_subscribers(cred, -1); | 208 | alter_cred_subscribers(cred, -1); |
209 | put_cred(cred); | 209 | put_cred(cred); |
210 | |||
211 | cred = (struct cred *) tsk->replacement_session_keyring; | ||
212 | if (cred) { | ||
213 | tsk->replacement_session_keyring = NULL; | ||
214 | validate_creds(cred); | ||
215 | put_cred(cred); | ||
216 | } | ||
217 | } | 210 | } |
218 | 211 | ||
219 | /** | 212 | /** |
@@ -396,8 +389,6 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags) | |||
396 | struct cred *new; | 389 | struct cred *new; |
397 | int ret; | 390 | int ret; |
398 | 391 | ||
399 | p->replacement_session_keyring = NULL; | ||
400 | |||
401 | if ( | 392 | if ( |
402 | #ifdef CONFIG_KEYS | 393 | #ifdef CONFIG_KEYS |
403 | !p->cred->thread_keyring && | 394 | !p->cred->thread_keyring && |