---

yaml --- r: 346322 b: refs/heads/master c: 5eaf563 h: refs/heads/master v: v3
git-mirror · Nov 19, 2012 · bf128a1 · bf128a1
1 parent aefecdb
commit bf128a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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