Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f23ca335462e3c84f13270b9e65f83936068ec2c

Authored by Oleg Nesterov
Committed by Al Viro
1 parent dea649b8ac
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 0 additions and 11 deletions Side-by-side Diff

include/linux/sched.h
Diff comments   View file @ f23ca33
... ... @@ -1357,8 +1357,6 @@
1357 1357 * credentials (COW) */
1358 1358 const struct cred __rcu *cred; /* effective (overridable) subjective task
1359 1359 * credentials (COW) */
1360   - struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
1361   -
1362 1360 char comm[TASK_COMM_LEN]; /* executable name excluding path
1363 1361 - access with [gs]et_task_comm (which lock
1364 1362 it with task_lock())
... ... @@ -207,13 +207,6 @@
207 207 validate_creds(cred);
208 208 alter_cred_subscribers(cred, -1);
209 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 /**
... ... @@ -395,8 +388,6 @@
395 388 #endif
396 389 struct cred *new;
397 390 int ret;
398   -
399   - p->replacement_session_keyring = NULL;
400 391  
401 392 if (
402 393 #ifdef CONFIG_KEYS