15 files changed, 250 insertions, 204 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 9c7e47ae4576..2febf5165fad 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -447,6 +447,7 @@ static int audit_filter_rules(struct task_struct *tsk,
                               struct audit_names *name,
                               enum audit_state *state)
 {
+        struct cred *cred = tsk->cred;
         int i, j, need_sid = 1;
         u32 sid;
 
@@ -466,28 +467,28 @@ static int audit_filter_rules(struct task_struct *tsk,
                         }
                         break;
                 case AUDIT_UID:
-                        result = audit_comparator(tsk->uid, f->op, f->val);
+                        result = audit_comparator(cred->uid, f->op, f->val);
                         break;
                 case AUDIT_EUID:
-                        result = audit_comparator(tsk->euid, f->op, f->val);
+                        result = audit_comparator(cred->euid, f->op, f->val);
                         break;
                 case AUDIT_SUID:
-                        result = audit_comparator(tsk->suid, f->op, f->val);
+                        result = audit_comparator(cred->suid, f->op, f->val);
                         break;
                 case AUDIT_FSUID:
-                        result = audit_comparator(tsk->fsuid, f->op, f->val);
+                        result = audit_comparator(cred->fsuid, f->op, f->val);
                         break;
                 case AUDIT_GID:
-                        result = audit_comparator(tsk->gid, f->op, f->val);
+                        result = audit_comparator(cred->gid, f->op, f->val);
                         break;
                 case AUDIT_EGID:
-                        result = audit_comparator(tsk->egid, f->op, f->val);
+                        result = audit_comparator(cred->egid, f->op, f->val);
                         break;
                 case AUDIT_SGID:
-                        result = audit_comparator(tsk->sgid, f->op, f->val);
+                        result = audit_comparator(cred->sgid, f->op, f->val);
                         break;
                 case AUDIT_FSGID:
-                        result = audit_comparator(tsk->fsgid, f->op, f->val);
+                        result = audit_comparator(cred->fsgid, f->op, f->val);
                         break;
                 case AUDIT_PERS:
                         result = audit_comparator(tsk->personality, f->op, f->val);
@@ -1228,6 +1229,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)
 
 static void audit_log_exit(struct audit_context *context, struct task_struct *tsk)
 {
+        struct cred *cred = tsk->cred;
         int i, call_panic = 0;
         struct audit_buffer *ab;
         struct audit_aux_data *aux;
@@ -1237,14 +1239,14 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
         context->pid = tsk->pid;
         if (!context->ppid)
                 context->ppid = sys_getppid();
-        context->uid = tsk->uid;
-        context->gid = tsk->gid;
-        context->euid = tsk->euid;
-        context->suid = tsk->suid;
-        context->fsuid = tsk->fsuid;
-        context->egid = tsk->egid;
-        context->sgid = tsk->sgid;
-        context->fsgid = tsk->fsgid;
+        context->uid = cred->uid;
+        context->gid = cred->gid;
+        context->euid = cred->euid;
+        context->suid = cred->suid;
+        context->fsuid = cred->fsuid;
+        context->egid = cred->egid;
+        context->sgid = cred->sgid;
+        context->fsgid = cred->fsgid;
         context->personality = tsk->personality;
 
         ab = audit_log_start(context, GFP_KERNEL, AUDIT_SYSCALL);
@@ -2086,7 +2088,7 @@ int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
                         audit_log_format(ab, "login pid=%d uid=%u "
                                 "old auid=%u new auid=%u"
                                 " old ses=%u new ses=%u",
-                                task->pid, task->uid,
+                                task->pid, task->cred->uid,
                                 task->loginuid, loginuid,
                                 task->sessionid, sessionid);
                         audit_log_end(ab);
@@ -2469,7 +2471,7 @@ void __audit_ptrace(struct task_struct *t)
 
         context->target_pid = t->pid;
         context->target_auid = audit_get_loginuid(t);
-        context->target_uid = t->uid;
+        context->target_uid = t->cred->uid;
         context->target_sessionid = audit_get_sessionid(t);
         security_task_getsecid(t, &context->target_sid);
         memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
@@ -2495,7 +2497,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
                         if (tsk->loginuid != -1)
                                 audit_sig_uid = tsk->loginuid;
                         else
-                                audit_sig_uid = tsk->uid;
+                                audit_sig_uid = tsk->cred->uid;
                         security_task_getsecid(tsk, &audit_sig_sid);
                 }
                 if (!audit_signals || audit_dummy_context())
@@ -2507,7 +2509,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
         if (!ctx->target_pid) {
                 ctx->target_pid = t->tgid;
                 ctx->target_auid = audit_get_loginuid(t);
-                ctx->target_uid = t->uid;
+                ctx->target_uid = t->cred->uid;
                 ctx->target_sessionid = audit_get_sessionid(t);
                 security_task_getsecid(t, &ctx->target_sid);
                 memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
@@ -2528,7 +2530,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
 
         axp->target_pid[axp->pid_count] = t->tgid;
         axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
-        axp->target_uid[axp->pid_count] = t->uid;
+        axp->target_uid[axp->pid_count] = t->cred->uid;
         axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
         security_task_getsecid(t, &axp->target_sid[axp->pid_count]);
         memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
@@ -2575,12 +2577,12 @@ void __audit_log_bprm_fcaps(struct linux_binprm *bprm, kernel_cap_t *pP, kernel_
         ax->fcap_ver = (vcaps.magic_etc & VFS_CAP_REVISION_MASK) >> VFS_CAP_REVISION_SHIFT;
 
         ax->old_pcap.permitted = *pP;
-        ax->old_pcap.inheritable = current->cap_inheritable;
+        ax->old_pcap.inheritable = current->cred->cap_inheritable;
         ax->old_pcap.effective = *pE;
 
-        ax->new_pcap.permitted = current->cap_permitted;
-        ax->new_pcap.inheritable = current->cap_inheritable;
-        ax->new_pcap.effective = current->cap_effective;
+        ax->new_pcap.permitted = current->cred->cap_permitted;
+        ax->new_pcap.inheritable = current->cred->cap_inheritable;
+        ax->new_pcap.effective = current->cred->cap_effective;
 }
 
 /**
diff --git a/kernel/capability.c b/kernel/capability.c
index 58b00519624a..a404b980b1bd 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -171,8 +171,8 @@ kernel_cap_t cap_set_effective(const kernel_cap_t pE_new)
 
         spin_lock(&task_capability_lock);
 
-        pE_old = current->cap_effective;
-        current->cap_effective = pE_new;
+        pE_old = current->cred->cap_effective;
+        current->cred->cap_effective = pE_new;
 
         spin_unlock(&task_capability_lock);
 
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 78f9b310c4f3..e210526e6401 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1293,7 +1293,9 @@ static int attach_task_by_pid(struct cgroup *cgrp, u64 pid)
                 rcu_read_unlock();
 
                 euid = current_euid();
-                if (euid && euid != tsk->uid && euid != tsk->suid) {
+                if (euid &&
+                    euid != tsk->cred->uid &&
+                    euid != tsk->cred->suid) {
                         put_task_struct(tsk);
                         return -EACCES;
                 }
diff --git a/kernel/exit.c b/kernel/exit.c
index 80137a5d9467..e0f6e1892fb9 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -160,7 +160,7 @@ void release_task(struct task_struct * p)
         int zap_leader;
 repeat:
         tracehook_prepare_release_task(p);
-        atomic_dec(&p->user->processes);
+        atomic_dec(&p->cred->user->processes);
         proc_flush_task(p);
         write_lock_irq(&tasklist_lock);
         tracehook_finish_release_task(p);
@@ -1272,7 +1272,7 @@ static int wait_task_zombie(struct task_struct *p, int options,
                 return 0;
 
         if (unlikely(options & WNOWAIT)) {
-                uid_t uid = p->uid;
+                uid_t uid = p->cred->uid;
                 int exit_code = p->exit_code;
                 int why, status;
 
@@ -1393,7 +1393,7 @@ static int wait_task_zombie(struct task_struct *p, int options,
         if (!retval && infop)
                 retval = put_user(pid, &infop->si_pid);
         if (!retval && infop)
-                retval = put_user(p->uid, &infop->si_uid);
+                retval = put_user(p->cred->uid, &infop->si_uid);
         if (!retval)
                 retval = pid;
 
@@ -1458,7 +1458,7 @@ static int wait_task_stopped(int ptrace, struct task_struct *p,
         if (!unlikely(options & WNOWAIT))
                 p->exit_code = 0;
 
-        uid = p->uid;
+        uid = p->cred->uid;
 unlock_sig:
         spin_unlock_irq(&p->sighand->siglock);
         if (!exit_code)
@@ -1535,7 +1535,7 @@ static int wait_task_continued(struct task_struct *p, int options,
         spin_unlock_irq(&p->sighand->siglock);
 
         pid = task_pid_vnr(p);
-        uid = p->uid;
+        uid = p->cred->uid;
         get_task_struct(p);
         read_unlock(&tasklist_lock);
 
diff --git a/kernel/fork.c b/kernel/fork.c
index f6083561dfe0..81fdc7733908 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -147,8 +147,8 @@ void __put_task_struct(struct task_struct *tsk)
         WARN_ON(tsk == current);
 
         security_task_free(tsk);
-        free_uid(tsk->user);
-        put_group_info(tsk->group_info);
+        free_uid(tsk->__temp_cred.user);
+        put_group_info(tsk->__temp_cred.group_info);
         delayacct_tsk_free(tsk);
 
         if (!profile_handoff_task(tsk))
@@ -969,17 +969,18 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
         DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
 #endif
+        p->cred = &p->__temp_cred;
         retval = -EAGAIN;
-        if (atomic_read(&p->user->processes) >=
+        if (atomic_read(&p->cred->user->processes) >=
                         p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
                 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-                    p->user != current->nsproxy->user_ns->root_user)
+                    p->cred->user != current->nsproxy->user_ns->root_user)
                         goto bad_fork_free;
         }
 
-        atomic_inc(&p->user->__count);
-        atomic_inc(&p->user->processes);
-        get_group_info(p->group_info);
+        atomic_inc(&p->cred->user->__count);
+        atomic_inc(&p->cred->user->processes);
+        get_group_info(p->cred->group_info);
 
         /*
          * If multiple threads are within copy_process(), then this check
@@ -1035,9 +1036,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->real_start_time = p->start_time;
         monotonic_to_bootbased(&p->real_start_time);
 #ifdef CONFIG_SECURITY
-        p->security = NULL;
+        p->cred->security = NULL;
 #endif
-        p->cap_bset = current->cap_bset;
         p->io_context = NULL;
         p->audit_context = NULL;
         cgroup_fork(p);
@@ -1298,9 +1298,9 @@ bad_fork_cleanup_cgroup:
 bad_fork_cleanup_put_domain:
         module_put(task_thread_info(p)->exec_domain->module);
 bad_fork_cleanup_count:
-        put_group_info(p->group_info);
-        atomic_dec(&p->user->processes);
-        free_uid(p->user);
+        put_group_info(p->cred->group_info);
+        atomic_dec(&p->cred->user->processes);
+        free_uid(p->cred->user);
 bad_fork_free:
         free_task(p);
 fork_out:
diff --git a/kernel/futex.c b/kernel/futex.c
index e06962132aaf..28421d8210b8 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -443,7 +443,8 @@ static struct task_struct * futex_find_get_task(pid_t pid)
 
         rcu_read_lock();
         p = find_task_by_vpid(pid);
-        if (!p || (euid != p->euid && euid != p->uid))
+        if (!p || (euid != p->cred->euid &&
+                   euid != p->cred->uid))
                 p = ERR_PTR(-ESRCH);
         else
                 get_task_struct(p);
@@ -1846,7 +1847,8 @@ sys_get_robust_list(int pid, struct robust_list_head __user * __user *head_ptr,
                 if (!p)
                         goto err_unlock;
                 ret = -EPERM;
-                if (euid != p->euid && euid != p->uid &&
+                if (euid != p->cred->euid &&
+                    euid != p->cred->uid &&
                     !capable(CAP_SYS_PTRACE))
                         goto err_unlock;
                 head = p->robust_list;
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 3254d4e41e88..2c3fd5ed34f5 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -151,8 +151,9 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
                 if (!p)
                         goto err_unlock;
                 ret = -EPERM;
-                if (euid != p->euid && euid != p->uid &&
-                                !capable(CAP_SYS_PTRACE))
+                if (euid != p->cred->euid &&
+                    euid != p->cred->uid &&
+                    !capable(CAP_SYS_PTRACE))
                         goto err_unlock;
                 head = p->compat_robust_list;
                 read_unlock(&tasklist_lock);
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 937f6b5b2008..49849d12dd12 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -115,6 +115,8 @@ int ptrace_check_attach(struct task_struct *child, int kill)
 
 int __ptrace_may_access(struct task_struct *task, unsigned int mode)
 {
+        struct cred *cred = current->cred, *tcred = task->cred;
+
         /* May we inspect the given task?
          * This check is used both for attaching with ptrace
          * and for allowing access to sensitive information in /proc.
@@ -123,19 +125,18 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
          * because setting up the necessary parent/child relationship
          * or halting the specified task is impossible.
          */
-        uid_t uid;
-        gid_t gid;
+        uid_t uid = cred->uid;
+        gid_t gid = cred->gid;
         int dumpable = 0;
         /* Don't let security modules deny introspection */
         if (task == current)
                 return 0;
-        current_uid_gid(&uid, &gid);
-        if ((uid != task->euid ||
-             uid != task->suid ||
-             uid != task->uid  ||
-             gid != task->egid ||
-             gid != task->sgid ||
-             gid != task->gid) && !capable(CAP_SYS_PTRACE))
+        if ((uid != tcred->euid ||
+             uid != tcred->suid ||
+             uid != tcred->uid  ||
+             gid != tcred->egid ||
+             gid != tcred->sgid ||
+             gid != tcred->gid) && !capable(CAP_SYS_PTRACE))
                 return -EPERM;
         smp_rmb();
         if (task->mm)
diff --git a/kernel/sched.c b/kernel/sched.c
index c3b8b1fcde0d..733c59e645aa 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -345,7 +345,7 @@ static inline struct task_group *task_group(struct task_struct *p)
         struct task_group *tg;
 
 #ifdef CONFIG_USER_SCHED
-        tg = p->user->tg;
+        tg = p->cred->user->tg;
 #elif defined(CONFIG_CGROUP_SCHED)
         tg = container_of(task_subsys_state(p, cpu_cgroup_subsys_id),
                                 struct task_group, css);
@@ -5182,8 +5182,8 @@ recheck:
 
                 /* can't change other user's priorities */
                 euid = current_euid();
-                if (euid != p->euid &&
-                    euid != p->uid)
+                if (euid != p->cred->euid &&
+                    euid != p->cred->uid)
                         return -EPERM;
         }
 
@@ -5417,7 +5417,9 @@ long sched_setaffinity(pid_t pid, const cpumask_t *in_mask)
 
         euid = current_euid();
         retval = -EPERM;
-        if (euid != p->euid && euid != p->uid && !capable(CAP_SYS_NICE))
+        if (euid != p->cred->euid &&
+            euid != p->cred->uid &&
+            !capable(CAP_SYS_NICE))
                 goto out_unlock;
 
         retval = security_task_setscheduler(p, 0, NULL);
diff --git a/kernel/signal.c b/kernel/signal.c
index 167b535fe1a9..80e8a6489f97 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -187,7 +187,7 @@ static struct sigqueue *__sigqueue_alloc(struct task_struct *t, gfp_t flags,
          * In order to avoid problems with "switch_user()", we want to make
          * sure that the compiler doesn't re-load "t->user"
          */
-        user = t->user;
+        user = t->cred->user;
         barrier();
         atomic_inc(&user->sigpending);
         if (override_rlimit ||
@@ -582,8 +582,8 @@ static int check_kill_permission(int sig, struct siginfo *info,
 
         uid = current_uid();
         euid = current_euid();
-        if ((euid ^ t->suid) && (euid ^ t->uid) &&
-            (uid  ^ t->suid) && (uid  ^ t->uid) &&
+        if ((euid ^ t->cred->suid) && (euid ^ t->cred->uid) &&
+            (uid  ^ t->cred->suid) && (uid  ^ t->cred->uid) &&
             !capable(CAP_KILL)) {
                 switch (sig) {
                 case SIGCONT:
@@ -1100,8 +1100,8 @@ int kill_pid_info_as_uid(int sig, struct siginfo *info, struct pid *pid,
                 goto out_unlock;
         }
         if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
-            && (euid != p->suid) && (euid != p->uid)
-            && (uid != p->suid) && (uid != p->uid)) {
+            && (euid != p->cred->suid) && (euid != p->cred->uid)
+            && (uid != p->cred->suid) && (uid != p->cred->uid)) {
                 ret = -EPERM;
                 goto out_unlock;
         }
@@ -1374,7 +1374,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
         info.si_pid = task_pid_nr_ns(tsk, tsk->parent->nsproxy->pid_ns);
         rcu_read_unlock();
 
-        info.si_uid = tsk->uid;
+        info.si_uid = tsk->cred->uid;
 
         thread_group_cputime(tsk, &cputime);
         info.si_utime = cputime_to_jiffies(cputime.utime);
@@ -1445,7 +1445,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why)
         info.si_pid = task_pid_nr_ns(tsk, tsk->parent->nsproxy->pid_ns);
         rcu_read_unlock();
 
-        info.si_uid = tsk->uid;
+        info.si_uid = tsk->cred->uid;
 
         info.si_utime = cputime_to_clock_t(tsk->utime);
         info.si_stime = cputime_to_clock_t(tsk->stime);
@@ -1713,7 +1713,7 @@ static int ptrace_signal(int signr, siginfo_t *info,
                 info->si_errno = 0;
                 info->si_code = SI_USER;
                 info->si_pid = task_pid_vnr(current->parent);
-                info->si_uid = current->parent->uid;
+                info->si_uid = current->parent->cred->uid;
         }
 
         /* If the (new) signal is now blocked, requeue it.  */
diff --git a/kernel/sys.c b/kernel/sys.c
index ed5c29c748ac..5d81f07c0150 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -117,7 +117,9 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
         uid_t euid = current_euid();
         int no_nice;
 
-        if (p->uid != euid && p->euid != euid && !capable(CAP_SYS_NICE)) {
+        if (p->cred->uid  != euid &&
+            p->cred->euid != euid &&
+            !capable(CAP_SYS_NICE)) {
                 error = -EPERM;
                 goto out;
         }
@@ -174,7 +176,7 @@ asmlinkage long sys_setpriority(int which, int who, int niceval)
                         } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
                         break;
                 case PRIO_USER:
-                        user = current->user;
+                        user = current->cred->user;
                         if (!who)
                                 who = current_uid();
                         else
@@ -182,7 +184,7 @@ asmlinkage long sys_setpriority(int which, int who, int niceval)
                                         goto out_unlock;        /* No processes for this user */
 
                         do_each_thread(g, p)
-                                if (p->uid == who)
+                                if (p->cred->uid == who)
                                         error = set_one_prio(p, niceval, error);
                         while_each_thread(g, p);
                         if (who != current_uid())
@@ -236,7 +238,7 @@ asmlinkage long sys_getpriority(int which, int who)
                         } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
                         break;
                 case PRIO_USER:
-                        user = current->user;
+                        user = current->cred->user;
                         if (!who)
                                 who = current_uid();
                         else
@@ -244,7 +246,7 @@ asmlinkage long sys_getpriority(int which, int who)
                                         goto out_unlock;        /* No processes for this user */
 
                         do_each_thread(g, p)
-                                if (p->uid == who) {
+                                if (p->cred->uid == who) {
                                         niceval = 20 - task_nice(p);
                                         if (niceval > retval)
                                                 retval = niceval;
@@ -472,8 +474,9 @@ void ctrl_alt_del(void)
  */
 asmlinkage long sys_setregid(gid_t rgid, gid_t egid)
 {
-        int old_rgid = current->gid;
-        int old_egid = current->egid;
+        struct cred *cred = current->cred;
+        int old_rgid = cred->gid;
+        int old_egid = cred->egid;
         int new_rgid = old_rgid;
         int new_egid = old_egid;
         int retval;
@@ -484,7 +487,7 @@ asmlinkage long sys_setregid(gid_t rgid, gid_t egid)
 
         if (rgid != (gid_t) -1) {
                 if ((old_rgid == rgid) ||
-                    (current->egid==rgid) ||
+                    (cred->egid == rgid) ||
                     capable(CAP_SETGID))
                         new_rgid = rgid;
                 else
@@ -492,8 +495,8 @@ asmlinkage long sys_setregid(gid_t rgid, gid_t egid)
         }
         if (egid != (gid_t) -1) {
                 if ((old_rgid == egid) ||
-                    (current->egid == egid) ||
-                    (current->sgid == egid) ||
+                    (cred->egid == egid) ||
+                    (cred->sgid == egid) ||
                     capable(CAP_SETGID))
                         new_egid = egid;
                 else
@@ -505,10 +508,10 @@ asmlinkage long sys_setregid(gid_t rgid, gid_t egid)
         }
         if (rgid != (gid_t) -1 ||
             (egid != (gid_t) -1 && egid != old_rgid))
-                current->sgid = new_egid;
-        current->fsgid = new_egid;
-        current->egid = new_egid;
-        current->gid = new_rgid;
+                cred->sgid = new_egid;
+        cred->fsgid = new_egid;
+        cred->egid = new_egid;
+        cred->gid = new_rgid;
         key_fsgid_changed(current);
         proc_id_connector(current, PROC_EVENT_GID);
         return 0;
@@ -521,7 +524,8 @@ asmlinkage long sys_setregid(gid_t rgid, gid_t egid)
  */
 asmlinkage long sys_setgid(gid_t gid)
 {
-        int old_egid = current->egid;
+        struct cred *cred = current->cred;
+        int old_egid = cred->egid;
         int retval;
 
         retval = security_task_setgid(gid, (gid_t)-1, (gid_t)-1, LSM_SETID_ID);
@@ -533,13 +537,13 @@ asmlinkage long sys_setgid(gid_t gid)
                         set_dumpable(current->mm, suid_dumpable);
                         smp_wmb();
                 }
-                current->gid = current->egid = current->sgid = current->fsgid = gid;
-        } else if ((gid == current->gid) || (gid == current->sgid)) {
+                cred->gid = cred->egid = cred->sgid = cred->fsgid = gid;
+        } else if ((gid == cred->gid) || (gid == cred->sgid)) {
                 if (old_egid != gid) {
                         set_dumpable(current->mm, suid_dumpable);
                         smp_wmb();
                 }
-                current->egid = current->fsgid = gid;
+                cred->egid = cred->fsgid = gid;
         }
         else
                 return -EPERM;
@@ -570,7 +574,7 @@ static int set_user(uid_t new_ruid, int dumpclear)
                 set_dumpable(current->mm, suid_dumpable);
                 smp_wmb();
         }
-        current->uid = new_ruid;
+        current->cred->uid = new_ruid;
         return 0;
 }
 
@@ -591,6 +595,7 @@ static int set_user(uid_t new_ruid, int dumpclear)
  */
 asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
 {
+        struct cred *cred = current->cred;
         int old_ruid, old_euid, old_suid, new_ruid, new_euid;
         int retval;
 
@@ -598,14 +603,14 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
         if (retval)
                 return retval;
 
-        new_ruid = old_ruid = current->uid;
-        new_euid = old_euid = current->euid;
-        old_suid = current->suid;
+        new_ruid = old_ruid = cred->uid;
+        new_euid = old_euid = cred->euid;
+        old_suid = cred->suid;
 
         if (ruid != (uid_t) -1) {
                 new_ruid = ruid;
                 if ((old_ruid != ruid) &&
-                    (current->euid != ruid) &&
+                    (cred->euid != ruid) &&
                     !capable(CAP_SETUID))
                         return -EPERM;
         }
@@ -613,8 +618,8 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
         if (euid != (uid_t) -1) {
                 new_euid = euid;
                 if ((old_ruid != euid) &&
-                    (current->euid != euid) &&
-                    (current->suid != euid) &&
+                    (cred->euid != euid) &&
+                    (cred->suid != euid) &&
                     !capable(CAP_SETUID))
                         return -EPERM;
         }
@@ -626,11 +631,11 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
                 set_dumpable(current->mm, suid_dumpable);
                 smp_wmb();
         }
-        current->fsuid = current->euid = new_euid;
+        cred->fsuid = cred->euid = new_euid;
         if (ruid != (uid_t) -1 ||
             (euid != (uid_t) -1 && euid != old_ruid))
-                current->suid = current->euid;
-        current->fsuid = current->euid;
+                cred->suid = cred->euid;
+        cred->fsuid = cred->euid;
 
         key_fsuid_changed(current);
         proc_id_connector(current, PROC_EVENT_UID);
@@ -653,7 +658,8 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
  */
 asmlinkage long sys_setuid(uid_t uid)
 {
-        int old_euid = current->euid;
+        struct cred *cred = current->cred;
+        int old_euid = cred->euid;
         int old_ruid, old_suid, new_suid;
         int retval;
 
@@ -661,23 +667,23 @@ asmlinkage long sys_setuid(uid_t uid)
         if (retval)
                 return retval;
 
-        old_ruid = current->uid;
-        old_suid = current->suid;
+        old_ruid = cred->uid;
+        old_suid = cred->suid;
         new_suid = old_suid;
         
         if (capable(CAP_SETUID)) {
                 if (uid != old_ruid && set_user(uid, old_euid != uid) < 0)
                         return -EAGAIN;
                 new_suid = uid;
-        } else if ((uid != current->uid) && (uid != new_suid))
+        } else if ((uid != cred->uid) && (uid != new_suid))
                 return -EPERM;
 
         if (old_euid != uid) {
                 set_dumpable(current->mm, suid_dumpable);
                 smp_wmb();
         }
-        current->fsuid = current->euid = uid;
-        current->suid = new_suid;
+        cred->fsuid = cred->euid = uid;
+        cred->suid = new_suid;
 
         key_fsuid_changed(current);
         proc_id_connector(current, PROC_EVENT_UID);
@@ -692,9 +698,10 @@ asmlinkage long sys_setuid(uid_t uid)
  */
 asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid)
 {
-        int old_ruid = current->uid;
-        int old_euid = current->euid;
-        int old_suid = current->suid;
+        struct cred *cred = current->cred;
+        int old_ruid = cred->uid;
+        int old_euid = cred->euid;
+        int old_suid = cred->suid;
         int retval;
 
         retval = security_task_setuid(ruid, euid, suid, LSM_SETID_RES);
@@ -702,30 +709,31 @@ asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid)
                 return retval;
 
         if (!capable(CAP_SETUID)) {
-                if ((ruid != (uid_t) -1) && (ruid != current->uid) &&
-                    (ruid != current->euid) && (ruid != current->suid))
+                if ((ruid != (uid_t) -1) && (ruid != cred->uid) &&
+                    (ruid != cred->euid) && (ruid != cred->suid))
                         return -EPERM;
-                if ((euid != (uid_t) -1) && (euid != current->uid) &&
-                    (euid != current->euid) && (euid != current->suid))
+                if ((euid != (uid_t) -1) && (euid != cred->uid) &&
+                    (euid != cred->euid) && (euid != cred->suid))
                         return -EPERM;
-                if ((suid != (uid_t) -1) && (suid != current->uid) &&
-                    (suid != current->euid) && (suid != current->suid))
+                if ((suid != (uid_t) -1) && (suid != cred->uid) &&
+                    (suid != cred->euid) && (suid != cred->suid))
                         return -EPERM;
         }
         if (ruid != (uid_t) -1) {
-                if (ruid != current->uid && set_user(ruid, euid != current->euid) < 0)
+                if (ruid != cred->uid &&
+                    set_user(ruid, euid != cred->euid) < 0)
                         return -EAGAIN;
         }
         if (euid != (uid_t) -1) {
-                if (euid != current->euid) {
+                if (euid != cred->euid) {
                         set_dumpable(current->mm, suid_dumpable);
                         smp_wmb();
                 }
-                current->euid = euid;
+                cred->euid = euid;
         }
-        current->fsuid = current->euid;
+        cred->fsuid = cred->euid;
         if (suid != (uid_t) -1)
-                current->suid = suid;
+                cred->suid = suid;
 
         key_fsuid_changed(current);
         proc_id_connector(current, PROC_EVENT_UID);
@@ -735,11 +743,12 @@ asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid)
 
 asmlinkage long sys_getresuid(uid_t __user *ruid, uid_t __user *euid, uid_t __user *suid)
 {
+        struct cred *cred = current->cred;
         int retval;
 
-        if (!(retval = put_user(current->uid, ruid)) &&
-            !(retval = put_user(current->euid, euid)))
-                retval = put_user(current->suid, suid);
+        if (!(retval = put_user(cred->uid, ruid)) &&
+            !(retval = put_user(cred->euid, euid)))
+                retval = put_user(cred->suid, suid);
 
         return retval;
 }
@@ -749,6 +758,7 @@ asmlinkage long sys_getresuid(uid_t __user *ruid, uid_t __user *euid, uid_t __us
  */
 asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid)
 {
+        struct cred *cred = current->cred;
         int retval;
 
         retval = security_task_setgid(rgid, egid, sgid, LSM_SETID_RES);
@@ -756,28 +766,28 @@ asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid)
                 return retval;
 
         if (!capable(CAP_SETGID)) {
-                if ((rgid != (gid_t) -1) && (rgid != current->gid) &&
-                    (rgid != current->egid) && (rgid != current->sgid))
+                if ((rgid != (gid_t) -1) && (rgid != cred->gid) &&
+                    (rgid != cred->egid) && (rgid != cred->sgid))
                         return -EPERM;
-                if ((egid != (gid_t) -1) && (egid != current->gid) &&
-                    (egid != current->egid) && (egid != current->sgid))
+                if ((egid != (gid_t) -1) && (egid != cred->gid) &&
+                    (egid != cred->egid) && (egid != cred->sgid))
                         return -EPERM;
-                if ((sgid != (gid_t) -1) && (sgid != current->gid) &&
-                    (sgid != current->egid) && (sgid != current->sgid))
+                if ((sgid != (gid_t) -1) && (sgid != cred->gid) &&
+                    (sgid != cred->egid) && (sgid != cred->sgid))
                         return -EPERM;
         }
         if (egid != (gid_t) -1) {
-                if (egid != current->egid) {
+                if (egid != cred->egid) {
                         set_dumpable(current->mm, suid_dumpable);
                         smp_wmb();
                 }
-                current->egid = egid;
+                cred->egid = egid;
         }
-        current->fsgid = current->egid;
+        cred->fsgid = cred->egid;
         if (rgid != (gid_t) -1)
-                current->gid = rgid;
+                cred->gid = rgid;
         if (sgid != (gid_t) -1)
-                current->sgid = sgid;
+                cred->sgid = sgid;
 
         key_fsgid_changed(current);
         proc_id_connector(current, PROC_EVENT_GID);
@@ -786,11 +796,12 @@ asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid)
 
 asmlinkage long sys_getresgid(gid_t __user *rgid, gid_t __user *egid, gid_t __user *sgid)
 {
+        struct cred *cred = current->cred;
         int retval;
 
-        if (!(retval = put_user(current->gid, rgid)) &&
-            !(retval = put_user(current->egid, egid)))
-                retval = put_user(current->sgid, sgid);
+        if (!(retval = put_user(cred->gid, rgid)) &&
+            !(retval = put_user(cred->egid, egid)))
+                retval = put_user(cred->sgid, sgid);
 
         return retval;
 }
@@ -804,20 +815,21 @@ asmlinkage long sys_getresgid(gid_t __user *rgid, gid_t __user *egid, gid_t __us
  */
 asmlinkage long sys_setfsuid(uid_t uid)
 {
+        struct cred *cred = current->cred;
         int old_fsuid;
 
-        old_fsuid = current->fsuid;
+        old_fsuid = cred->fsuid;
         if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS))
                 return old_fsuid;
 
-        if (uid == current->uid || uid == current->euid ||
-            uid == current->suid || uid == current->fsuid || 
+        if (uid == cred->uid || uid == cred->euid ||
+            uid == cred->suid || uid == cred->fsuid ||
             capable(CAP_SETUID)) {
                 if (uid != old_fsuid) {
                         set_dumpable(current->mm, suid_dumpable);
                         smp_wmb();
                 }
-                current->fsuid = uid;
+                cred->fsuid = uid;
         }
 
         key_fsuid_changed(current);
@@ -833,20 +845,21 @@ asmlinkage long sys_setfsuid(uid_t uid)
  */
 asmlinkage long sys_setfsgid(gid_t gid)
 {
+        struct cred *cred = current->cred;
         int old_fsgid;
 
-        old_fsgid = current->fsgid;
+        old_fsgid = cred->fsgid;
         if (security_task_setgid(gid, (gid_t)-1, (gid_t)-1, LSM_SETID_FS))
                 return old_fsgid;
 
-        if (gid == current->gid || gid == current->egid ||
-            gid == current->sgid || gid == current->fsgid || 
+        if (gid == cred->gid || gid == cred->egid ||
+            gid == cred->sgid || gid == cred->fsgid ||
             capable(CAP_SETGID)) {
                 if (gid != old_fsgid) {
                         set_dumpable(current->mm, suid_dumpable);
                         smp_wmb();
                 }
-                current->fsgid = gid;
+                cred->fsgid = gid;
                 key_fsgid_changed(current);
                 proc_id_connector(current, PROC_EVENT_GID);
         }
@@ -1208,8 +1221,15 @@ int groups_search(struct group_info *group_info, gid_t grp)
         return 0;
 }
 
-/* validate and set current->group_info */
-int set_current_groups(struct group_info *group_info)
+/**
+ * set_groups - Change a group subscription in a security record
+ * @sec: The security record to alter
+ * @group_info: The group list to impose
+ *
+ * Validate a group subscription and, if valid, impose it upon a task security
+ * record.
+ */
+int set_groups(struct cred *cred, struct group_info *group_info)
 {
         int retval;
         struct group_info *old_info;
@@ -1221,20 +1241,34 @@ int set_current_groups(struct group_info *group_info)
         groups_sort(group_info);
         get_group_info(group_info);
 
-        task_lock(current);
-        old_info = current->group_info;
-        current->group_info = group_info;
-        task_unlock(current);
+        spin_lock(&cred->lock);
+        old_info = cred->group_info;
+        cred->group_info = group_info;
+        spin_unlock(&cred->lock);
 
         put_group_info(old_info);
-
         return 0;
 }
 
+EXPORT_SYMBOL(set_groups);
+
+/**
+ * set_current_groups - Change current's group subscription
+ * @group_info: The group list to impose
+ *
+ * Validate a group subscription and, if valid, impose it upon current's task
+ * security record.
+ */
+int set_current_groups(struct group_info *group_info)
+{
+        return set_groups(current->cred, group_info);
+}
+
 EXPORT_SYMBOL(set_current_groups);
 
 asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist)
 {
+        struct cred *cred = current->cred;
         int i = 0;
 
         /*
@@ -1246,13 +1280,13 @@ asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist)
                 return -EINVAL;
 
         /* no need to grab task_lock here; it cannot change */
-        i = current->group_info->ngroups;
+        i = cred->group_info->ngroups;
         if (gidsetsize) {
                 if (i > gidsetsize) {
                         i = -EINVAL;
                         goto out;
                 }
-                if (groups_to_user(grouplist, current->group_info)) {
+                if (groups_to_user(grouplist, cred->group_info)) {
                         i = -EFAULT;
                         goto out;
                 }
@@ -1296,9 +1330,10 @@ asmlinkage long sys_setgroups(int gidsetsize, gid_t __user *grouplist)
  */
 int in_group_p(gid_t grp)
 {
+        struct cred *cred = current->cred;
         int retval = 1;
-        if (grp != current->fsgid)
-                retval = groups_search(current->group_info, grp);
+        if (grp != cred->fsgid)
+                retval = groups_search(cred->group_info, grp);
         return retval;
 }
 
@@ -1306,9 +1341,10 @@ EXPORT_SYMBOL(in_group_p);
 
 int in_egroup_p(gid_t grp)
 {
+        struct cred *cred = current->cred;
         int retval = 1;
-        if (grp != current->egid)
-                retval = groups_search(current->group_info, grp);
+        if (grp != cred->egid)
+                retval = groups_search(cred->group_info, grp);
         return retval;
 }
 
@@ -1624,7 +1660,9 @@ asmlinkage long sys_umask(int mask)
 asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
                           unsigned long arg4, unsigned long arg5)
 {
-        long error = 0;
+        struct task_struct *me = current;
+        unsigned char comm[sizeof(me->comm)];
+        long error;
 
         if (security_task_prctl(option, arg2, arg3, arg4, arg5, &error))
                 return error;
@@ -1635,39 +1673,41 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
                                 error = -EINVAL;
                                 break;
                         }
-                        current->pdeath_signal = arg2;
+                        me->pdeath_signal = arg2;
+                        error = 0;
                         break;
                 case PR_GET_PDEATHSIG:
-                        error = put_user(current->pdeath_signal, (int __user *)arg2);
+                        error = put_user(me->pdeath_signal, (int __user *)arg2);
                         break;
                 case PR_GET_DUMPABLE:
-                        error = get_dumpable(current->mm);
+                        error = get_dumpable(me->mm);
                         break;
                 case PR_SET_DUMPABLE:
                         if (arg2 < 0 || arg2 > 1) {
                                 error = -EINVAL;
                                 break;
                         }
-                        set_dumpable(current->mm, arg2);
+                        set_dumpable(me->mm, arg2);
+                        error = 0;
                         break;
 
                 case PR_SET_UNALIGN:
-                        error = SET_UNALIGN_CTL(current, arg2);
+                        error = SET_UNALIGN_CTL(me, arg2);
                         break;
                 case PR_GET_UNALIGN:
-                        error = GET_UNALIGN_CTL(current, arg2);
+                        error = GET_UNALIGN_CTL(me, arg2);
                         break;
                 case PR_SET_FPEMU:
-                        error = SET_FPEMU_CTL(current, arg2);
+                        error = SET_FPEMU_CTL(me, arg2);
                         break;
                 case PR_GET_FPEMU:
-                        error = GET_FPEMU_CTL(current, arg2);
+                        error = GET_FPEMU_CTL(me, arg2);
                         break;
                 case PR_SET_FPEXC:
-                        error = SET_FPEXC_CTL(current, arg2);
+                        error = SET_FPEXC_CTL(me, arg2);
                         break;
                 case PR_GET_FPEXC:
-                        error = GET_FPEXC_CTL(current, arg2);
+                        error = GET_FPEXC_CTL(me, arg2);
                         break;
                 case PR_GET_TIMING:
                         error = PR_TIMING_STATISTICAL;
@@ -1675,33 +1715,28 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
                 case PR_SET_TIMING:
                         if (arg2 != PR_TIMING_STATISTICAL)
                                 error = -EINVAL;
+                        else
+                                error = 0;
                         break;
 
-                case PR_SET_NAME: {
-                        struct task_struct *me = current;
-                        unsigned char ncomm[sizeof(me->comm)];
-
-                        ncomm[sizeof(me->comm)-1] = 0;
-                        if (strncpy_from_user(ncomm, (char __user *)arg2,
-                                                sizeof(me->comm)-1) < 0)
+                case PR_SET_NAME:
+                        comm[sizeof(me->comm)-1] = 0;
+                        if (strncpy_from_user(comm, (char __user *)arg2,
+                                              sizeof(me->comm) - 1) < 0)
                                 return -EFAULT;
-                        set_task_comm(me, ncomm);
+                        set_task_comm(me, comm);
                         return 0;
-                }
-                case PR_GET_NAME: {
-                        struct task_struct *me = current;
-                        unsigned char tcomm[sizeof(me->comm)];
-
-                        get_task_comm(tcomm, me);
-                        if (copy_to_user((char __user *)arg2, tcomm, sizeof(tcomm)))
+                case PR_GET_NAME:
+                        get_task_comm(comm, me);
+                        if (copy_to_user((char __user *)arg2, comm,
+                                         sizeof(comm)))
                                 return -EFAULT;
                         return 0;
-                }
                 case PR_GET_ENDIAN:
-                        error = GET_ENDIAN(current, arg2);
+                        error = GET_ENDIAN(me, arg2);
                         break;
                 case PR_SET_ENDIAN:
-                        error = SET_ENDIAN(current, arg2);
+                        error = SET_ENDIAN(me, arg2);
                         break;
 
                 case PR_GET_SECCOMP:
@@ -1725,6 +1760,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
                                         current->default_timer_slack_ns;
                         else
                                 current->timer_slack_ns = arg2;
+                        error = 0;
                         break;
                 default:
                         error = -EINVAL;
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9f3b478f9171..5c97c5b4ea8f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -246,7 +246,7 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
 
         memcpy(data->comm, tsk->comm, TASK_COMM_LEN);
         data->pid = tsk->pid;
-        data->uid = tsk->uid;
+        data->uid = task_uid(tsk);
         data->nice = tsk->static_prio - 20 - MAX_RT_PRIO;
         data->policy = tsk->policy;
         data->rt_priority = tsk->rt_priority;
diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 8ebcd8532dfb..6d1ed07bf312 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -53,8 +53,8 @@ void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk)
                 stats->ac_flag |= AXSIG;
         stats->ac_nice   = task_nice(tsk);
         stats->ac_sched  = tsk->policy;
-        stats->ac_uid    = tsk->uid;
-        stats->ac_gid    = tsk->gid;
+        stats->ac_uid    = tsk->cred->uid;
+        stats->ac_gid    = tsk->cred->gid;
         stats->ac_pid    = tsk->pid;
         rcu_read_lock();
         stats->ac_ppid   = pid_alive(tsk) ?
diff --git a/kernel/uid16.c b/kernel/uid16.c
index 3e41c1673e2f..71f07fc39fea 100644
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -86,9 +86,9 @@ asmlinkage long sys_getresuid16(old_uid_t __user *ruid, old_uid_t __user *euid,
 {
         int retval;
 
-        if (!(retval = put_user(high2lowuid(current->uid), ruid)) &&
-            !(retval = put_user(high2lowuid(current->euid), euid)))
-                retval = put_user(high2lowuid(current->suid), suid);
+        if (!(retval = put_user(high2lowuid(current->cred->uid), ruid)) &&
+            !(retval = put_user(high2lowuid(current->cred->euid), euid)))
+                retval = put_user(high2lowuid(current->cred->suid), suid);
 
         return retval;
 }
@@ -106,9 +106,9 @@ asmlinkage long sys_getresgid16(old_gid_t __user *rgid, old_gid_t __user *egid,
 {
         int retval;
 
-        if (!(retval = put_user(high2lowgid(current->gid), rgid)) &&
-            !(retval = put_user(high2lowgid(current->egid), egid)))
-                retval = put_user(high2lowgid(current->sgid), sgid);
+        if (!(retval = put_user(high2lowgid(current->cred->gid), rgid)) &&
+            !(retval = put_user(high2lowgid(current->cred->egid), egid)))
+                retval = put_user(high2lowgid(current->cred->sgid), sgid);
 
         return retval;
 }
@@ -166,20 +166,20 @@ asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist)
         if (gidsetsize < 0)
                 return -EINVAL;
 
-        get_group_info(current->group_info);
-        i = current->group_info->ngroups;
+        get_group_info(current->cred->group_info);
+        i = current->cred->group_info->ngroups;
         if (gidsetsize) {
                 if (i > gidsetsize) {
                         i = -EINVAL;
                         goto out;
                 }
-                if (groups16_to_user(grouplist, current->group_info)) {
+                if (groups16_to_user(grouplist, current->cred->group_info)) {
                         i = -EFAULT;
                         goto out;
                 }
         }
 out:
-        put_group_info(current->group_info);
+        put_group_info(current->cred->group_info);
         return i;
 }
 
@@ -210,20 +210,20 @@ asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist)
 
 asmlinkage long sys_getuid16(void)
 {
-        return high2lowuid(current->uid);
+        return high2lowuid(current->cred->uid);
 }
 
 asmlinkage long sys_geteuid16(void)
 {
-        return high2lowuid(current->euid);
+        return high2lowuid(current->cred->euid);
 }
 
 asmlinkage long sys_getgid16(void)
 {
-        return high2lowgid(current->gid);
+        return high2lowgid(current->cred->gid);
 }
 
 asmlinkage long sys_getegid16(void)
 {
-        return high2lowgid(current->egid);
+        return high2lowgid(current->cred->egid);
 }
diff --git a/kernel/user.c b/kernel/user.c
index 39d6159fae43..104d22ac84d5 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -457,11 +457,11 @@ void switch_uid(struct user_struct *new_user)
          * cheaply with the new uid cache, so if it matters
          * we should be checking for it.  -DaveM
          */
-        old_user = current->user;
+        old_user = current->cred->user;
         atomic_inc(&new_user->processes);
         atomic_dec(&old_user->processes);
         switch_uid_keyring(new_user);
-        current->user = new_user;
+        current->cred->user = new_user;
         sched_switch_user(current);
 
         /*