From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 2 Jul 2013 17:04:54 +0000 (-0700)
Subject: userns: Allow PR_CAPBSET_DROP in a user namespace.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=160da84dbb39443fdade7151bc63a88f8e953077;p=openwrt%2Fstaging%2Fblogic.git

userns: Allow PR_CAPBSET_DROP in a user namespace.

As the capabilites and capability bounding set are per user namespace
properties it is safe to allow changing them with just CAP_SETPCAP
permission in the user namespace.

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Tested-by: Richard Weinberger <richard@nod.at>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---

diff --git a/security/commoncap.c b/security/commoncap.c
index c44b6fe6648e..9fccf71b2b62 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -824,7 +824,7 @@ int cap_task_setnice(struct task_struct *p, int nice)
  */
 static long cap_prctl_drop(struct cred *new, unsigned long cap)
 {
-	if (!capable(CAP_SETPCAP))
+	if (!ns_capable(current_user_ns(), CAP_SETPCAP))
 		return -EPERM;
 	if (!cap_valid(cap))
 		return -EINVAL;