aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/security.h
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-01-03 12:25:15 -0500
committerEric Paris <eparis@redhat.com>2012-01-05 18:52:53 -0500
commitb7e724d303b684655e4ca3dabd5a6840ad19012d (patch)
tree5474d8d49d61ade4c5e306a0485a835587237bf4 /include/linux/security.h
parent6a9de49115d5ff9871d953af1a5c8249e1585731 (diff)
capabilities: reverse arguments to security_capable
security_capable takes ns, cred, cap. But the LSM capable() hook takes cred, ns, cap. The capability helper functions also take cred, ns, cap. Rather than flip argument order just to flip it back, leave them alone. Heck, this should be a little faster since argument will be in the right place! Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r--include/linux/security.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 4921163b2752..ee969ff40a26 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1666,7 +1666,7 @@ int security_capset(struct cred *new, const struct cred *old,
1666 const kernel_cap_t *effective, 1666 const kernel_cap_t *effective,
1667 const kernel_cap_t *inheritable, 1667 const kernel_cap_t *inheritable,
1668 const kernel_cap_t *permitted); 1668 const kernel_cap_t *permitted);
1669int security_capable(struct user_namespace *ns, const struct cred *cred, 1669int security_capable(const struct cred *cred, struct user_namespace *ns,
1670 int cap); 1670 int cap);
1671int security_real_capable(struct task_struct *tsk, struct user_namespace *ns, 1671int security_real_capable(struct task_struct *tsk, struct user_namespace *ns,
1672 int cap); 1672 int cap);
@@ -1863,8 +1863,8 @@ static inline int security_capset(struct cred *new,
1863 return cap_capset(new, old, effective, inheritable, permitted); 1863 return cap_capset(new, old, effective, inheritable, permitted);
1864} 1864}
1865 1865
1866static inline int security_capable(struct user_namespace *ns, 1866static inline int security_capable(const struct cred *cred,
1867 const struct cred *cred, int cap) 1867 struct user_namespace *ns, int cap)
1868{ 1868{
1869 return cap_capable(cred, ns, cap, SECURITY_CAP_AUDIT); 1869 return cap_capable(cred, ns, cap, SECURITY_CAP_AUDIT);
1870} 1870}