aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-03-03 17:17:49 -0500
committerColin Cross <ccross@android.com>2011-03-03 17:17:49 -0500
commitc871fe663a6368fd0e98f5a3bfd81b0b9c591266 (patch)
treed09c244e94c09f985caf259c434c7eda8ff53229 /security
parentd5fdafd38ca0c28c4648909ce0afd0a5420309ca (diff)
parentdb811ca0f48578f9940f49f284ac81e336b264ad (diff)
Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c
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 739e40362f44..7b7308ace8c5 100644
--- a/security/security.c
+++ b/security/security.c
@@ -154,10 +154,9 @@ int security_capset(struct cred *new, const struct cred *old,
154 effective, inheritable, permitted); 154 effective, inheritable, permitted);
155} 155}
156 156
157int security_capable(int cap) 157int security_capable(const struct cred *cred, int cap)
158{ 158{
159 return security_ops->capable(current, current_cred(), cap, 159 return security_ops->capable(current, cred, cap, SECURITY_CAP_AUDIT);
160 SECURITY_CAP_AUDIT);
161} 160}
162 161
163int security_real_capable(struct task_struct *tsk, int cap) 162int security_real_capable(struct task_struct *tsk, int cap)