aboutsummaryrefslogtreecommitdiffstats
path: root/mm/migrate.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-11-13 18:39:12 -0500
committerJames Morris <jmorris@namei.org>2008-11-13 18:39:12 -0500
commit76aac0e9a17742e60d408be1a706e9aaad370891 (patch)
treee873a000d9c96209726e0958e311f005c13b2ed5 /mm/migrate.c
parentb103c59883f1ec6e4d548b25054608cb5724453c (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/migrate.c')
-rw-r--r--mm/migrate.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index 6602941bfab0..6263c24c4afe 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1048,6 +1048,7 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
1048 struct task_struct *task; 1048 struct task_struct *task;
1049 struct mm_struct *mm; 1049 struct mm_struct *mm;
1050 int err; 1050 int err;
1051 uid_t uid, euid;
1051 1052
1052 /* Check flags */ 1053 /* Check flags */
1053 if (flags & ~(MPOL_MF_MOVE|MPOL_MF_MOVE_ALL)) 1054 if (flags & ~(MPOL_MF_MOVE|MPOL_MF_MOVE_ALL))
@@ -1075,8 +1076,10 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
1075 * capabilities, superuser privileges or the same 1076 * capabilities, superuser privileges or the same
1076 * userid as the target process. 1077 * userid as the target process.
1077 */ 1078 */
1078 if ((current->euid != task->suid) && (current->euid != task->uid) && 1079 uid = current_uid();
1079 (current->uid != task->suid) && (current->uid != task->uid) && 1080 euid = current_euid();
1081 if (euid != task->suid && euid != task->uid &&
1082 uid != task->suid && uid != task->uid &&
1080 !capable(CAP_SYS_NICE)) { 1083 !capable(CAP_SYS_NICE)) {
1081 err = -EPERM; 1084 err = -EPERM;
1082 goto out; 1085 goto out;