aboutsummaryrefslogtreecommitdiffstats
path: root/mm/mempolicy.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-11-13 18:39:19 -0500
committerJames Morris <jmorris@namei.org>2008-11-13 18:39:19 -0500
commitc69e8d9c01db2adc503464993c358901c9af9de4 (patch)
treebed94aaa9aeb7a7834d1c880f72b62a11a752c78 /mm/mempolicy.c
parent86a264abe542cfececb4df129bc45a0338d8cdb9 (diff)
CRED: Use RCU to access another task's creds and to release a task's own creds
Use RCU to access another task's creds and to release a task's own creds. This means that it will be possible for the credentials of a task to be replaced without another task (a) requiring a full lock to read them, and (b) seeing deallocated memory. 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/mempolicy.c')
-rw-r--r--mm/mempolicy.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index b23492ee3e50..7555219c535b 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1110,7 +1110,7 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
1110 const unsigned long __user *old_nodes, 1110 const unsigned long __user *old_nodes,
1111 const unsigned long __user *new_nodes) 1111 const unsigned long __user *new_nodes)
1112{ 1112{
1113 struct cred *cred, *tcred; 1113 const struct cred *cred = current_cred(), *tcred;
1114 struct mm_struct *mm; 1114 struct mm_struct *mm;
1115 struct task_struct *task; 1115 struct task_struct *task;
1116 nodemask_t old; 1116 nodemask_t old;
@@ -1145,14 +1145,16 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
1145 * capabilities, superuser privileges or the same 1145 * capabilities, superuser privileges or the same
1146 * userid as the target process. 1146 * userid as the target process.
1147 */ 1147 */
1148 cred = current->cred; 1148 rcu_read_lock();
1149 tcred = task->cred; 1149 tcred = __task_cred(task);
1150 if (cred->euid != tcred->suid && cred->euid != tcred->uid && 1150 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
1151 cred->uid != tcred->suid && cred->uid != tcred->uid && 1151 cred->uid != tcred->suid && cred->uid != tcred->uid &&
1152 !capable(CAP_SYS_NICE)) { 1152 !capable(CAP_SYS_NICE)) {
1153 rcu_read_unlock();
1153 err = -EPERM; 1154 err = -EPERM;
1154 goto out; 1155 goto out;
1155 } 1156 }
1157 rcu_read_unlock();
1156 1158
1157 task_nodes = cpuset_mems_allowed(task); 1159 task_nodes = cpuset_mems_allowed(task);
1158 /* Is the user allowed to access the target nodes? */ 1160 /* Is the user allowed to access the target nodes? */