1 files changed, 5 insertions, 4 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 867e5d6a55c2..38a055758a9b 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -366,7 +366,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
         if (shmflg & SHM_HUGETLB) {
                 /* hugetlb_file_setup takes care of mlock user accounting */
                 file = hugetlb_file_setup(name, size);
-                shp->mlock_user = current->user;
+                shp->mlock_user = current_user();
         } else {
                 int acctflag = VM_ACCOUNT;
                 /*
@@ -752,9 +752,10 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                         goto out_unlock;
 
                 if (!capable(CAP_IPC_LOCK)) {
+                        uid_t euid = current_euid();
                         err = -EPERM;
-                        if (current->euid != shp->shm_perm.uid &&
-                            current->euid != shp->shm_perm.cuid)
+                        if (euid != shp->shm_perm.uid &&
+                            euid != shp->shm_perm.cuid)
                                 goto out_unlock;
                         if (cmd == SHM_LOCK &&
                             !current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur)
@@ -766,7 +767,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf)
                         goto out_unlock;
                 
                 if(cmd==SHM_LOCK) {
-                        struct user_struct * user = current->user;
+                        struct user_struct *user = current_user();
                         if (!is_file_hugepages(shp->shm_file)) {
                                 err = shmem_lock(shp->shm_file, 1, user);
                                 if (!err && !(shp->shm_perm.mode & SHM_LOCKED)){