1 files changed, 1 insertions, 1 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index d88ac5a07ec..a86a3a5c8a1 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -716,7 +716,7 @@ asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf)
                         struct user_struct * user = current->user;
                         if (!is_file_hugepages(shp->shm_file)) {
                                 err = shmem_lock(shp->shm_file, 1, user);
-                                if (!err) {
+                                if (!err && !(shp->shm_perm.mode & SHM_LOCKED)){
                                         shp->shm_perm.mode |= SHM_LOCKED;
                                         shp->mlock_user = user;
                                 }