From: Eric Paris <eparis@redhat.com>
Date: Tue, 3 Jan 2012 17:25:15 +0000 (-0500)
Subject: capabitlies: ns_capable can use the cap helpers rather than lsm call
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d2a7009f0bb03fa22ad08dd25472efa0568126b9;p=deliverable%2Flinux.git

capabitlies: ns_capable can use the cap helpers rather than lsm call

Just to reduce the number of places to change if we every change the LSM
hook, use the capability helpers internally when possible.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
---

diff --git a/kernel/capability.c b/kernel/capability.c
index 5f99e5d68e1f..47626446c39a 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -384,7 +384,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
 		BUG();
 	}
 
-	if (security_capable(current_cred(), ns, cap) == 0) {
+	if (has_ns_capability(current, ns, cap)) {
 		current->flags |= PF_SUPERPRIV;
 		return true;
 	}