diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2011-02-09 22:11:51 -0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-02-11 17:41:58 +1100 |
| commit | 6037b715d6fab139742c3df8851db4c823081561 (patch) | |
| tree | aba9e9427debd4fa5b904daefa8e71a6320f4b93 /include/linux/security.h | |
| parent | deabb19ba4bd8c06ae69bc262e3594b515e3a459 (diff) | |
| download | lwn-6037b715d6fab139742c3df8851db4c823081561.tar.gz lwn-6037b715d6fab139742c3df8851db4c823081561.zip | |
security: add cred argument to security_capable()
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>
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index c642bb8b8f5a..b2b7f9749f5e 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1662,7 +1662,7 @@ int security_capset(struct cred *new, const struct cred *old, const kernel_cap_t *effective, const kernel_cap_t *inheritable, const kernel_cap_t *permitted); -int security_capable(int cap); +int security_capable(const struct cred *cred, int cap); int security_real_capable(struct task_struct *tsk, int cap); int security_real_capable_noaudit(struct task_struct *tsk, int cap); int security_sysctl(struct ctl_table *table, int op); @@ -1856,9 +1856,9 @@ static inline int security_capset(struct cred *new, return cap_capset(new, old, effective, inheritable, permitted); } -static inline int security_capable(int cap) +static inline int security_capable(const struct cred *cred, int cap) { - return cap_capable(current, current_cred(), cap, SECURITY_CAP_AUDIT); + return cap_capable(current, cred, cap, SECURITY_CAP_AUDIT); } static inline int security_real_capable(struct task_struct *tsk, int cap) |