diff options
author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /mm/migrate.c | |
parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 037b0967c1e3..21631ab8c08b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -1075,6 +1075,7 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages, | |||
1075 | const int __user *nodes, | 1075 | const int __user *nodes, |
1076 | int __user *status, int flags) | 1076 | int __user *status, int flags) |
1077 | { | 1077 | { |
1078 | const struct cred *cred = current_cred(), *tcred; | ||
1078 | struct task_struct *task; | 1079 | struct task_struct *task; |
1079 | struct mm_struct *mm; | 1080 | struct mm_struct *mm; |
1080 | int err; | 1081 | int err; |
@@ -1105,12 +1106,16 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages, | |||
1105 | * capabilities, superuser privileges or the same | 1106 | * capabilities, superuser privileges or the same |
1106 | * userid as the target process. | 1107 | * userid as the target process. |
1107 | */ | 1108 | */ |
1108 | if ((current->euid != task->suid) && (current->euid != task->uid) && | 1109 | rcu_read_lock(); |
1109 | (current->uid != task->suid) && (current->uid != task->uid) && | 1110 | tcred = __task_cred(task); |
1111 | if (cred->euid != tcred->suid && cred->euid != tcred->uid && | ||
1112 | cred->uid != tcred->suid && cred->uid != tcred->uid && | ||
1110 | !capable(CAP_SYS_NICE)) { | 1113 | !capable(CAP_SYS_NICE)) { |
1114 | rcu_read_unlock(); | ||
1111 | err = -EPERM; | 1115 | err = -EPERM; |
1112 | goto out; | 1116 | goto out; |
1113 | } | 1117 | } |
1118 | rcu_read_unlock(); | ||
1114 | 1119 | ||
1115 | err = security_task_movememory(task); | 1120 | err = security_task_movememory(task); |
1116 | if (err) | 1121 | if (err) |