2 files changed, 12 insertions, 13 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index ade739f67f1d..0b13ace266f2 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -305,8 +305,9 @@ err:
 static int mqueue_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct inode *inode;
-        struct ipc_namespace *ns = data;
+        struct ipc_namespace *ns = sb->s_fs_info;
 
+        sb->s_iflags |= SB_I_NOEXEC | SB_I_NODEV;
         sb->s_blocksize = PAGE_SIZE;
         sb->s_blocksize_bits = PAGE_SHIFT;
         sb->s_magic = MQUEUE_MAGIC;
@@ -326,17 +327,14 @@ static struct dentry *mqueue_mount(struct file_system_type *fs_type,
                          int flags, const char *dev_name,
                          void *data)
 {
-        if (!(flags & MS_KERNMOUNT)) {
-                struct ipc_namespace *ns = current->nsproxy->ipc_ns;
-                /* Don't allow mounting unless the caller has CAP_SYS_ADMIN
-                 * over the ipc namespace.
-                 */
-                if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN))
-                        return ERR_PTR(-EPERM);
-
-                data = ns;
+        struct ipc_namespace *ns;
+        if (flags & MS_KERNMOUNT) {
+                ns = data;
+                data = NULL;
+        } else {
+                ns = current->nsproxy->ipc_ns;
         }
-        return mount_ns(fs_type, flags, data, mqueue_fill_super);
+        return mount_ns(fs_type, flags, data, ns, ns->user_ns, mqueue_fill_super);
 }
 
 static void init_once(void *foo)
diff --git a/ipc/namespace.c b/ipc/namespace.c
index 068caf18d565..04cb07eb81f1 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -34,8 +34,11 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
         ns->ns.ops = &ipcns_operations;
 
         atomic_set(&ns->count, 1);
+        ns->user_ns = get_user_ns(user_ns);
+
         err = mq_init_ns(ns);
         if (err) {
+                put_user_ns(ns->user_ns);
                 ns_free_inum(&ns->ns);
                 kfree(ns);
                 return ERR_PTR(err);
@@ -46,8 +49,6 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
         msg_init_ns(ns);
         shm_init_ns(ns);
 
-        ns->user_ns = get_user_ns(user_ns);
-
         return ns;
 }