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 /mm/migrate.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 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 6263c24c4afe..794443da1b4f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -1045,10 +1045,10 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages, | |||
1045 | const int __user *nodes, | 1045 | const int __user *nodes, |
1046 | int __user *status, int flags) | 1046 | int __user *status, int flags) |
1047 | { | 1047 | { |
1048 | struct cred *cred, *tcred; | ||
1048 | struct task_struct *task; | 1049 | struct task_struct *task; |
1049 | struct mm_struct *mm; | 1050 | struct mm_struct *mm; |
1050 | int err; | 1051 | int err; |
1051 | uid_t uid, euid; | ||
1052 | 1052 | ||
1053 | /* Check flags */ | 1053 | /* Check flags */ |
1054 | if (flags & ~(MPOL_MF_MOVE|MPOL_MF_MOVE_ALL)) | 1054 | if (flags & ~(MPOL_MF_MOVE|MPOL_MF_MOVE_ALL)) |
@@ -1076,10 +1076,10 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages, | |||
1076 | * capabilities, superuser privileges or the same | 1076 | * capabilities, superuser privileges or the same |
1077 | * userid as the target process. | 1077 | * userid as the target process. |
1078 | */ | 1078 | */ |
1079 | uid = current_uid(); | 1079 | cred = current->cred; |
1080 | euid = current_euid(); | 1080 | tcred = task->cred; |
1081 | if (euid != task->suid && euid != task->uid && | 1081 | if (cred->euid != tcred->suid && cred->euid != tcred->uid && |
1082 | uid != task->suid && uid != task->uid && | 1082 | cred->uid != tcred->suid && cred->uid != tcred->uid && |
1083 | !capable(CAP_SYS_NICE)) { | 1083 | !capable(CAP_SYS_NICE)) { |
1084 | err = -EPERM; | 1084 | err = -EPERM; |
1085 | goto out; | 1085 | goto out; |