diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:26:19 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-24 10:18:05 -0400 |
commit | 9e48858f7d36a6a3849f1d1b40c3bf5624b4ee7c (patch) | |
tree | 5d8fe586c5b1bbab36acc3b76b2b4dd1bc538968 /security/selinux | |
parent | 86abcf9cebf7b5ceb33facde297face5ec4d2260 (diff) |
security: rename ptrace_may_access => ptrace_access_check
The ->ptrace_may_access() methods are named confusingly - the real
ptrace_may_access() returns a bool, while these security checks have
a retval convention.
Rename it to ptrace_access_check, to reduce the confusion factor.
[ Impact: cleanup, no code changed ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d6f64783acd1..e3b4f3083dd7 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -1854,12 +1854,12 @@ static inline u32 open_file_to_av(struct file *file) | |||
1854 | 1854 | ||
1855 | /* Hook functions begin here. */ | 1855 | /* Hook functions begin here. */ |
1856 | 1856 | ||
1857 | static int selinux_ptrace_may_access(struct task_struct *child, | 1857 | static int selinux_ptrace_access_check(struct task_struct *child, |
1858 | unsigned int mode) | 1858 | unsigned int mode) |
1859 | { | 1859 | { |
1860 | int rc; | 1860 | int rc; |
1861 | 1861 | ||
1862 | rc = cap_ptrace_may_access(child, mode); | 1862 | rc = cap_ptrace_access_check(child, mode); |
1863 | if (rc) | 1863 | if (rc) |
1864 | return rc; | 1864 | return rc; |
1865 | 1865 | ||
@@ -5315,7 +5315,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) | |||
5315 | static struct security_operations selinux_ops = { | 5315 | static struct security_operations selinux_ops = { |
5316 | .name = "selinux", | 5316 | .name = "selinux", |
5317 | 5317 | ||
5318 | .ptrace_may_access = selinux_ptrace_may_access, | 5318 | .ptrace_access_check = selinux_ptrace_access_check, |
5319 | .ptrace_traceme = selinux_ptrace_traceme, | 5319 | .ptrace_traceme = selinux_ptrace_traceme, |
5320 | .capget = selinux_capget, | 5320 | .capget = selinux_capget, |
5321 | .capset = selinux_capset, | 5321 | .capset = selinux_capset, |