diff options
author | Tejun Heo <tj@kernel.org> | 2011-06-17 10:50:40 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2011-06-22 13:26:29 -0400 |
commit | 06d984737bac0545fe20bb5447ee488b95adb531 (patch) | |
tree | b8d89d21a53c28a025dd42598bc3406e25db5ba8 /security | |
parent | 4b9d33e6d83cc05a8005a8f9a8b9677fa0f53626 (diff) |
ptrace: s/tracehook_tracer_task()/ptrace_parent()/
tracehook.h is on the way out. Rename tracehook_tracer_task() to
ptrace_parent() and move it from tracehook.h to ptrace.h.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: John Johansen <john.johansen@canonical.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/apparmor/domain.c | 2 | ||||
-rw-r--r-- | security/selinux/hooks.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index c825c6e0b636..7312bf9f7afc 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c | |||
@@ -67,7 +67,7 @@ static int may_change_ptraced_domain(struct task_struct *task, | |||
67 | int error = 0; | 67 | int error = 0; |
68 | 68 | ||
69 | rcu_read_lock(); | 69 | rcu_read_lock(); |
70 | tracer = tracehook_tracer_task(task); | 70 | tracer = ptrace_parent(task); |
71 | if (tracer) { | 71 | if (tracer) { |
72 | /* released below */ | 72 | /* released below */ |
73 | cred = get_task_cred(tracer); | 73 | cred = get_task_cred(tracer); |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index a0d38459d650..fc07d18ed6fc 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2048,7 +2048,7 @@ static int selinux_bprm_set_creds(struct linux_binprm *bprm) | |||
2048 | u32 ptsid = 0; | 2048 | u32 ptsid = 0; |
2049 | 2049 | ||
2050 | rcu_read_lock(); | 2050 | rcu_read_lock(); |
2051 | tracer = tracehook_tracer_task(current); | 2051 | tracer = ptrace_parent(current); |
2052 | if (likely(tracer != NULL)) { | 2052 | if (likely(tracer != NULL)) { |
2053 | sec = __task_cred(tracer)->security; | 2053 | sec = __task_cred(tracer)->security; |
2054 | ptsid = sec->sid; | 2054 | ptsid = sec->sid; |
@@ -5314,7 +5314,7 @@ static int selinux_setprocattr(struct task_struct *p, | |||
5314 | Otherwise, leave SID unchanged and fail. */ | 5314 | Otherwise, leave SID unchanged and fail. */ |
5315 | ptsid = 0; | 5315 | ptsid = 0; |
5316 | task_lock(p); | 5316 | task_lock(p); |
5317 | tracer = tracehook_tracer_task(p); | 5317 | tracer = ptrace_parent(p); |
5318 | if (tracer) | 5318 | if (tracer) |
5319 | ptsid = task_sid(tracer); | 5319 | ptsid = task_sid(tracer); |
5320 | task_unlock(p); | 5320 | task_unlock(p); |