From bf128a13ba9c37de2507e4c2050695b300b092c8 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 21 Nov 2011 17:22:31 -0800
Subject: [PATCH] --- yaml --- r: 346322 b: refs/heads/master c:
 5eaf563e53294d6696e651466697eb9d491f3946 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0490a510f2c8..86e03b7c9b5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cdf5b45ffbac294bcdfac0393df72f7687c01e8
+refs/heads/master: 5eaf563e53294d6696e651466697eb9d491f3946
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 811ffbad7889..8c29abb19014 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1569,14 +1569,6 @@ long do_fork(unsigned long clone_flags,
 		if (clone_flags & (CLONE_THREAD|CLONE_PARENT))
 			return -EINVAL;
 	}
-	if (clone_flags & CLONE_NEWUSER) {
-		/* hopefully this check will go away when userns support is
-		 * complete
-		 */
-		if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
-				!capable(CAP_SETGID))
-			return -EPERM;
-	}
 
 	/*
 	 * Determine whether and which event to report to ptracer.  When