diff options
author | Eric Paris <eparis@redhat.com> | 2012-01-03 12:25:15 -0500 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2012-01-05 18:52:55 -0500 |
commit | 2920a8409de5a51575d03deca07e5bb2be6fc98d (patch) | |
tree | 1f16eba518068e7096b6ff200c09d3d31e285586 /include/linux/security.h | |
parent | c7eba4a97563fd8b431787f7ad623444f2da80c6 (diff) |
capabilities: remove all _real_ interfaces
The name security_real_capable and security_real_capable_noaudit just don't
make much sense to me. Convert them to use security_capable and
security_capable_noaudit.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index caff54eee686..e345a9313a60 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1670,10 +1670,6 @@ int security_capable(const struct cred *cred, struct user_namespace *ns, | |||
1670 | int cap); | 1670 | int cap); |
1671 | int security_capable_noaudit(const struct cred *cred, struct user_namespace *ns, | 1671 | int security_capable_noaudit(const struct cred *cred, struct user_namespace *ns, |
1672 | int cap); | 1672 | int cap); |
1673 | int security_real_capable(struct task_struct *tsk, struct user_namespace *ns, | ||
1674 | int cap); | ||
1675 | int security_real_capable_noaudit(struct task_struct *tsk, | ||
1676 | struct user_namespace *ns, int cap); | ||
1677 | int security_quotactl(int cmds, int type, int id, struct super_block *sb); | 1673 | int security_quotactl(int cmds, int type, int id, struct super_block *sb); |
1678 | int security_quota_on(struct dentry *dentry); | 1674 | int security_quota_on(struct dentry *dentry); |
1679 | int security_syslog(int type); | 1675 | int security_syslog(int type); |
@@ -1876,27 +1872,6 @@ static inline int security_capable_noaudit(const struct cred *cred, | |||
1876 | return cap_capable(cred, ns, cap, SECURITY_CAP_NOAUDIT); | 1872 | return cap_capable(cred, ns, cap, SECURITY_CAP_NOAUDIT); |
1877 | } | 1873 | } |
1878 | 1874 | ||
1879 | static inline int security_real_capable(struct task_struct *tsk, struct user_namespace *ns, int cap) | ||
1880 | { | ||
1881 | int ret; | ||
1882 | |||
1883 | rcu_read_lock(); | ||
1884 | ret = cap_capable(__task_cred(tsk), ns, cap, SECURITY_CAP_AUDIT); | ||
1885 | rcu_read_unlock(); | ||
1886 | return ret; | ||
1887 | } | ||
1888 | |||
1889 | static inline | ||
1890 | int security_real_capable_noaudit(struct task_struct *tsk, struct user_namespace *ns, int cap) | ||
1891 | { | ||
1892 | int ret; | ||
1893 | |||
1894 | rcu_read_lock(); | ||
1895 | ret = cap_capable(__task_cred(tsk), ns, cap, SECURITY_CAP_NOAUDIT); | ||
1896 | rcu_read_unlock(); | ||
1897 | return ret; | ||
1898 | } | ||
1899 | |||
1900 | static inline int security_quotactl(int cmds, int type, int id, | 1875 | static inline int security_quotactl(int cmds, int type, int id, |
1901 | struct super_block *sb) | 1876 | struct super_block *sb) |
1902 | { | 1877 | { |