1 files changed, 13 insertions, 5 deletions

diff --git a/ipc/util.c b/ipc/util.c
index 361fd1c96fcf..5a1808c774a2 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -258,6 +258,8 @@ int ipc_get_maxid(struct ipc_ids *ids)
  
 int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)
 {
+        uid_t euid;
+        gid_t egid;
         int id, err;
 
         if (size > IPCMNI)
@@ -280,8 +282,9 @@ int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)
 
         ids->in_use++;
 
-        new->cuid = new->uid = current->euid;
-        new->gid = new->cgid = current->egid;
+        current_euid_egid(&euid, &egid);
+        new->cuid = new->uid = euid;
+        new->gid = new->cgid = egid;
 
         new->seq = ids->seq++;
         if(ids->seq > ids->seq_max)
@@ -620,13 +623,15 @@ void ipc_rcu_putref(void *ptr)
  
 int ipcperms (struct kern_ipc_perm *ipcp, short flag)
 {       /* flag will most probably be 0 or S_...UGO from <linux/stat.h> */
+        uid_t euid = current_euid();
         int requested_mode, granted_mode, err;
 
         if (unlikely((err = audit_ipc_obj(ipcp))))
                 return err;
         requested_mode = (flag >> 6) | (flag >> 3) | flag;
         granted_mode = ipcp->mode;
-        if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
+        if (euid == ipcp->cuid ||
+            euid == ipcp->uid)
                 granted_mode >>= 6;
         else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
                 granted_mode >>= 3;
@@ -788,6 +793,7 @@ struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd,
                                       struct ipc64_perm *perm, int extra_perm)
 {
         struct kern_ipc_perm *ipcp;
+        uid_t euid;
         int err;
 
         down_write(&ids->rw_mutex);
@@ -807,8 +813,10 @@ struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd,
                 if (err)
                         goto out_unlock;
         }
-        if (current->euid == ipcp->cuid ||
-            current->euid == ipcp->uid || capable(CAP_SYS_ADMIN))
+
+        euid = current_euid();
+        if (euid == ipcp->cuid ||
+            euid == ipcp->uid  || capable(CAP_SYS_ADMIN))
                 return ipcp;
 
         err = -EPERM;