diff --git a/[refs] b/[refs]
index ab4a9dc2acd1..fd4ea555a60a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3211c120a85b792978bcb4be7b2886df18d27f0
+refs/heads/master: 41c21e351e79004dbb4efa4bc14a53a7e0af38c5
diff --git a/trunk/kernel/user_namespace.c b/trunk/kernel/user_namespace.c
index 5c16f3aa757a..e134d8f365dd 100644
--- a/trunk/kernel/user_namespace.c
+++ b/trunk/kernel/user_namespace.c
@@ -613,10 +613,10 @@ static ssize_t map_write(struct file *file, const char __user *buf,
 	if (map->nr_extents != 0)
 		goto out;
 
-	/* Require the appropriate privilege CAP_SETUID or CAP_SETGID
-	 * over the user namespace in order to set the id mapping.
+	/*
+	 * Adjusting namespace settings requires capabilities on the target.
 	 */
-	if (cap_valid(cap_setid) && !ns_capable(ns, cap_setid))
+	if (cap_valid(cap_setid) && !file_ns_capable(file, ns, CAP_SYS_ADMIN))
 		goto out;
 
 	/* Get a buffer */