From 9e6770cb4ee553ae91ab4bbc5e584f30dfba073a Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 31 Jan 2013 04:23:54 -0800
Subject: [PATCH] --- yaml --- r: 357775 b: refs/heads/master c:
 f74f70f8b10b435f5f20247e70d1d86b53a59685 h: refs/heads/master i:   357773:
 c6c70866abb7748dcbf0ffb408f34a1c3069b4f6   357771:
 95117c85dbfadda84d4aa91d79740b86378829e7   357767:
 9cd7cd1cb937ae465e282ca6445f278a7669e586   357759:
 972f29565b3ce3cbc13732276db3e5d8a7f8a16f v: v3

---
 [refs]               | 2 +-
 trunk/fs/afs/super.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74f3bd7cfe14..2ecf6650e17d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66fdb93f882d21612a5287cd1303c9b1391ebf5d
+refs/heads/master: f74f70f8b10b435f5f20247e70d1d86b53a59685
diff --git a/trunk/fs/afs/super.c b/trunk/fs/afs/super.c
index 43165009428d..7c31ec399575 100644
--- a/trunk/fs/afs/super.c
+++ b/trunk/fs/afs/super.c
@@ -24,6 +24,8 @@
 #include <linux/parser.h>
 #include <linux/statfs.h>
 #include <linux/sched.h>
+#include <linux/nsproxy.h>
+#include <net/net_namespace.h>
 #include "internal.h"
 
 #define AFS_FS_MAGIC 0x6B414653 /* 'kAFS' */
@@ -363,6 +365,10 @@ static struct dentry *afs_mount(struct file_system_type *fs_type,
 
 	memset(&params, 0, sizeof(params));
 
+	ret = -EINVAL;
+	if (current->nsproxy->net_ns != &init_net)
+		goto error;
+
 	/* parse the options and device name */
 	if (options) {
 		ret = afs_parse_options(&params, options, &dev_name);