diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-15 05:45:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-15 05:45:22 +0100 |
| commit | 24115cc28a564355ba7a7a4a38e836b20d14b030 (patch) | |
| tree | f1343c7df5ba8af6dc1ded5f658ed2ea243cff87 /security | |
| parent | a62fa1c3306c6a377b8f9a80fc61c0a360fd925c (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
Merge branch 'linus' into auto-latest
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 b995428f1c96..bb33ecadcf95 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) |