summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2011-02-09 22:11:51 -0800
committerWilly Tarreau <w@1wt.eu>2015-12-06 00:49:09 +0100
commitddf5836aa820bf3b8c59ea3cca77881b41ca8d82 (patch)
treea05aca5675a927069e3023cf1f24aaf7bfb633a6 /security
parent154f5f0c6a1289a715bd70d3024cd336a2fd56ff (diff)
security: add cred argument to security_capable()
commit 6037b715d6fab139742c3df8851db4c823081561 upstream. Expand security_capable() to include cred, so that it can be usable in a wider range of call sites. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: James Morris <jmorris@namei.org> [wt: needed by next patch only] Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'security')
-rw-r--r--security/security.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c
index c4c673240c1c..227b173cd55e 100644
--- a/security/security.c
+++ b/security/security.c
@@ -151,10 +151,9 @@ int security_capset(struct cred *new, const struct cred *old,
effective, inheritable, permitted);
}
-int security_capable(int cap)
+int security_capable(const struct cred *cred, int cap)
{
- return security_ops->capable(current, current_cred(), cap,
- SECURITY_CAP_AUDIT);
+ return security_ops->capable(current, cred, cap, SECURITY_CAP_AUDIT);
}
int security_real_capable(struct task_struct *tsk, int cap)