diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:39:12 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:39:12 -0500 |
commit | 76aac0e9a17742e60d408be1a706e9aaad370891 (patch) | |
tree | e873a000d9c96209726e0958e311f005c13b2ed5 /mm/mempolicy.c | |
parent | b103c59883f1ec6e4d548b25054608cb5724453c (diff) |
CRED: Wrap task credential accesses in the core kernel
Wrap access to task credentials so that they can be separated more easily from
the task_struct during the introduction of COW creds.
Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().
Change some task->e?[ug]id to task_e?[ug]id(). In some places it makes more
sense to use RCU directly rather than a convenient wrapper; these will be
addressed by later patches.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-audit@redhat.com
Cc: containers@lists.linux-foundation.org
Cc: linux-mm@kvack.org
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r-- | mm/mempolicy.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 36f42573a335..07a96474077d 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -1115,6 +1115,7 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, | |||
1115 | nodemask_t old; | 1115 | nodemask_t old; |
1116 | nodemask_t new; | 1116 | nodemask_t new; |
1117 | nodemask_t task_nodes; | 1117 | nodemask_t task_nodes; |
1118 | uid_t uid, euid; | ||
1118 | int err; | 1119 | int err; |
1119 | 1120 | ||
1120 | err = get_nodes(&old, old_nodes, maxnode); | 1121 | err = get_nodes(&old, old_nodes, maxnode); |
@@ -1144,8 +1145,10 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, | |||
1144 | * capabilities, superuser privileges or the same | 1145 | * capabilities, superuser privileges or the same |
1145 | * userid as the target process. | 1146 | * userid as the target process. |
1146 | */ | 1147 | */ |
1147 | if ((current->euid != task->suid) && (current->euid != task->uid) && | 1148 | uid = current_uid(); |
1148 | (current->uid != task->suid) && (current->uid != task->uid) && | 1149 | euid = current_euid(); |
1150 | if (euid != task->suid && euid != task->uid && | ||
1151 | uid != task->suid && uid != task->uid && | ||
1149 | !capable(CAP_SYS_NICE)) { | 1152 | !capable(CAP_SYS_NICE)) { |
1150 | err = -EPERM; | 1153 | err = -EPERM; |
1151 | goto out; | 1154 | goto out; |