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>

3 files changed, 11 insertions, 11 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 07a96474077d..b23492ee3e50 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1110,12 +1110,12 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
                 const unsigned long __user *old_nodes,
                 const unsigned long __user *new_nodes)
 {
+        struct cred *cred, *tcred;
         struct mm_struct *mm;
         struct task_struct *task;
         nodemask_t old;
         nodemask_t new;
         nodemask_t task_nodes;
-        uid_t uid, euid;
         int err;
 
         err = get_nodes(&old, old_nodes, maxnode);
@@ -1145,10 +1145,10 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
          * capabilities, superuser privileges or the same
          * userid as the target process.
          */
-        uid = current_uid();
-        euid = current_euid();
-        if (euid != task->suid && euid != task->uid &&
-            uid  != task->suid && uid  != task->uid &&
+        cred = current->cred;
+        tcred = task->cred;
+        if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
+            cred->uid  != tcred->suid && cred->uid  != tcred->uid &&
             !capable(CAP_SYS_NICE)) {
                 err = -EPERM;
                 goto out;
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,
                         const int __user *nodes,
                         int __user *status, int flags)
 {
+        struct cred *cred, *tcred;
         struct task_struct *task;
         struct mm_struct *mm;
         int err;
-        uid_t uid, euid;
 
         /* Check flags */
         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,
          * capabilities, superuser privileges or the same
          * userid as the target process.
          */
-        uid = current_uid();
-        euid = current_euid();
-        if (euid != task->suid && euid != task->uid &&
-            uid  != task->suid && uid  != task->uid &&
+        cred = current->cred;
+        tcred = task->cred;
+        if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
+            cred->uid  != tcred->suid && cred->uid  != tcred->uid &&
             !capable(CAP_SYS_NICE)) {
                 err = -EPERM;
                 goto out;
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 34a458aa7997..3af787ba2077 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -298,7 +298,7 @@ static void dump_tasks(const struct mem_cgroup *mem)
 
                 task_lock(p);
                 printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d     %3d %s\n",
-                       p->pid, p->uid, p->tgid, p->mm->total_vm,
+                       p->pid, p->cred->uid, p->tgid, p->mm->total_vm,
                        get_mm_rss(p->mm), (int)task_cpu(p), p->oomkilladj,
                        p->comm);
                 task_unlock(p);