1 files changed, 25 insertions, 21 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 464694e0aa4a..1a314c89f93c 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -39,7 +39,6 @@
 #include <linux/nsproxy.h>
 #include <linux/mount.h>
 #include <linux/ipc_namespace.h>
-#include <linux/ima.h>
 
 #include <asm/uaccess.h>
 
@@ -101,6 +100,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
 void shm_exit_ns(struct ipc_namespace *ns)
 {
         free_ipcs(ns, &shm_ids(ns), do_shm_rmid);
+        idr_destroy(&ns->ids[IPC_SHM_IDS].ipcs_idr);
 }
 #endif
 
@@ -290,28 +290,31 @@ static unsigned long shm_get_unmapped_area(struct file *file,
         unsigned long flags)
 {
         struct shm_file_data *sfd = shm_file_data(file);
-        return get_unmapped_area(sfd->file, addr, len, pgoff, flags);
-}
-
-int is_file_shm_hugepages(struct file *file)
-{
-        int ret = 0;
-
-        if (file->f_op == &shm_file_operations) {
-                struct shm_file_data *sfd;
-                sfd = shm_file_data(file);
-                ret = is_file_hugepages(sfd->file);
-        }
-        return ret;
+        return sfd->file->f_op->get_unmapped_area(sfd->file, addr, len,
+                                                pgoff, flags);
 }
 
 static const struct file_operations shm_file_operations = {
         .mmap           = shm_mmap,
         .fsync          = shm_fsync,
         .release        = shm_release,
+#ifndef CONFIG_MMU
+        .get_unmapped_area      = shm_get_unmapped_area,
+#endif
+};
+
+static const struct file_operations shm_file_operations_huge = {
+        .mmap           = shm_mmap,
+        .fsync          = shm_fsync,
+        .release        = shm_release,
         .get_unmapped_area      = shm_get_unmapped_area,
 };
 
+int is_file_shm_hugepages(struct file *file)
+{
+        return file->f_op == &shm_file_operations_huge;
+}
+
 static const struct vm_operations_struct shm_vm_ops = {
         .open   = shm_open,     /* callback for a new vm-area open */
         .close  = shm_close,    /* callback for when the vm-area is released */
@@ -761,8 +764,7 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
                         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)
+                        if (cmd == SHM_LOCK && !rlimit(RLIMIT_MEMLOCK))
                                 goto out_unlock;
                 }
 
@@ -878,8 +880,8 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
         if (err)
                 goto out_unlock;
 
-        path.dentry = dget(shp->shm_file->f_path.dentry);
-        path.mnt    = shp->shm_file->f_path.mnt;
+        path = shp->shm_file->f_path;
+        path_get(&path);
         shp->shm_nattch++;
         size = i_size_read(path.dentry->d_inode);
         shm_unlock(shp);
@@ -889,10 +891,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
         if (!sfd)
                 goto out_put_dentry;
 
-        file = alloc_file(path.mnt, path.dentry, f_mode, &shm_file_operations);
+        file = alloc_file(&path, f_mode,
+                          is_file_hugepages(shp->shm_file) ?
+                                &shm_file_operations_huge :
+                                &shm_file_operations);
         if (!file)
                 goto out_free;
-        ima_counts_get(file);
 
         file->private_data = sfd;
         file->f_mapping = shp->shm_file->f_mapping;
@@ -947,7 +951,7 @@ out_unlock:
 out_free:
         kfree(sfd);
 out_put_dentry:
-        dput(path.dentry);
+        path_put(&path);
         goto out_nattch;
 }