2 files changed, 7 insertions, 2 deletions

diff --git a/net/ceph/Kconfig b/net/ceph/Kconfig
index cc04dd667a10..e50cc69ae8ca 100644
--- a/net/ceph/Kconfig
+++ b/net/ceph/Kconfig
@@ -1,6 +1,6 @@
 config CEPH_LIB
-        tristate "Ceph core library (EXPERIMENTAL)"
-        depends on INET && EXPERIMENTAL
+        tristate "Ceph core library"
+        depends on INET
         select LIBCRC32C
         select CRYPTO_AES
         select CRYPTO
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index c5605ae96714..e65e6e4be38b 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -15,6 +15,8 @@
 #include <linux/slab.h>
 #include <linux/statfs.h>
 #include <linux/string.h>
+#include <linux/nsproxy.h>
+#include <net/net_namespace.h>
 
 
 #include <linux/ceph/ceph_features.h>
@@ -308,6 +310,9 @@ ceph_parse_options(char *options, const char *dev_name,
         int err = -ENOMEM;
         substring_t argstr[MAX_OPT_ARGS];
 
+        if (current->nsproxy->net_ns != &init_net)
+                return ERR_PTR(-EINVAL);
+
         opt = kzalloc(sizeof(*opt), GFP_KERNEL);
         if (!opt)
                 return ERR_PTR(-ENOMEM);