diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:39:16 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:39:16 -0500 |
commit | b6dff3ec5e116e3af6f537d4caedcad6b9e5082a (patch) | |
tree | 9e76f972eb7ce9b84e0146c8e4126a3f86acb428 /kernel/user.c | |
parent | 15a2460ed0af7538ca8e6c610fe607a2cd9da142 (diff) |
CRED: Separate task security context from task_struct
Separate the task security context from task_struct. At this point, the
security data is temporarily embedded in the task_struct with two pointers
pointing to it.
Note that the Alpha arch is altered as it refers to (E)UID and (E)GID in
entry.S via asm-offsets.
With comment fixes Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel/user.c')
-rw-r--r-- | kernel/user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/user.c b/kernel/user.c index 39d6159fae43..104d22ac84d5 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
@@ -457,11 +457,11 @@ void switch_uid(struct user_struct *new_user) | |||
457 | * cheaply with the new uid cache, so if it matters | 457 | * cheaply with the new uid cache, so if it matters |
458 | * we should be checking for it. -DaveM | 458 | * we should be checking for it. -DaveM |
459 | */ | 459 | */ |
460 | old_user = current->user; | 460 | old_user = current->cred->user; |
461 | atomic_inc(&new_user->processes); | 461 | atomic_inc(&new_user->processes); |
462 | atomic_dec(&old_user->processes); | 462 | atomic_dec(&old_user->processes); |
463 | switch_uid_keyring(new_user); | 463 | switch_uid_keyring(new_user); |
464 | current->user = new_user; | 464 | current->cred->user = new_user; |
465 | sched_switch_user(current); | 465 | sched_switch_user(current); |
466 | 466 | ||
467 | /* | 467 | /* |