From 37927dcb90443115495d64fdd8baeac60294b0c2 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Sun, 14 Apr 2013 11:44:04 -0700 Subject: [PATCH] --- yaml --- r: 362611 b: refs/heads/master c: 41c21e351e79004dbb4efa4bc14a53a7e0af38c5 h: refs/heads/master i: 362609: a4e8dc24a86a9e494553ceea71403f1734a365cc 362607: 8d10e160f718fe55310897d0f2da1a98d29e6dfb v: v3 --- [refs] | 2 +- trunk/kernel/user_namespace.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 */