Merge branch 'next' into for-linus

1 files changed, 16 insertions, 15 deletions

diff --git a/kernel/uid16.c b/kernel/uid16.c
index 3e41c1673e2f..2460c3199b5a 100644
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -84,11 +84,12 @@ asmlinkage long sys_setresuid16(old_uid_t ruid, old_uid_t euid, old_uid_t suid)
 
 asmlinkage long sys_getresuid16(old_uid_t __user *ruid, old_uid_t __user *euid, old_uid_t __user *suid)
 {
+        const struct cred *cred = current_cred();
         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(cred->uid),  ruid)) &&
+            !(retval   = put_user(high2lowuid(cred->euid), euid)))
+                retval = put_user(high2lowuid(cred->suid), suid);
 
         return retval;
 }
@@ -104,11 +105,12 @@ asmlinkage long sys_setresgid16(old_gid_t rgid, old_gid_t egid, old_gid_t sgid)
 
 asmlinkage long sys_getresgid16(old_gid_t __user *rgid, old_gid_t __user *egid, old_gid_t __user *sgid)
 {
+        const struct cred *cred = current_cred();
         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(cred->gid),  rgid)) &&
+            !(retval   = put_user(high2lowgid(cred->egid), egid)))
+                retval = put_user(high2lowgid(cred->sgid), sgid);
 
         return retval;
 }
@@ -161,25 +163,24 @@ static int groups16_from_user(struct group_info *group_info,
 
 asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist)
 {
-        int i = 0;
+        const struct cred *cred = current_cred();
+        int i;
 
         if (gidsetsize < 0)
                 return -EINVAL;
 
-        get_group_info(current->group_info);
-        i = current->group_info->ngroups;
+        i = 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, cred->group_info)) {
                         i = -EFAULT;
                         goto out;
                 }
         }
 out:
-        put_group_info(current->group_info);
         return i;
 }
 
@@ -210,20 +211,20 @@ asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist)
 
 asmlinkage long sys_getuid16(void)
 {
-        return high2lowuid(current->uid);
+        return high2lowuid(current_uid());
 }
 
 asmlinkage long sys_geteuid16(void)
 {
-        return high2lowuid(current->euid);
+        return high2lowuid(current_euid());
 }
 
 asmlinkage long sys_getgid16(void)
 {
-        return high2lowgid(current->gid);
+        return high2lowgid(current_gid());
 }
 
 asmlinkage long sys_getegid16(void)
 {
-        return high2lowgid(current->egid);
+        return high2lowgid(current_egid());
 }