diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2011-02-09 22:11:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-24 14:54:29 -0800 |
| commit | 50194161bee65819784a08b5b7d4f2a2320ed8c2 (patch) | |
| tree | 273848f603fec10c177fd5623b5479a71f5c80cd /security | |
| parent | dcf2ef88e48b7257b23aa13b9358779c72609a2c (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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security')
| -rw-r--r-- | security/security.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c index e5fb07a3052d..8d57dbb6bf29 100644 --- a/security/security.c +++ b/security/security.c @@ -154,10 +154,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) |