diff options
| author | Tejun Heo <tj@kernel.org> | 2011-06-17 16:50:40 +0200 |
|---|---|---|
| committer | Oleg Nesterov <oleg@redhat.com> | 2011-06-22 19:26:29 +0200 |
| commit | 06d984737bac0545fe20bb5447ee488b95adb531 (patch) | |
| tree | b8d89d21a53c28a025dd42598bc3406e25db5ba8 /security | |
| parent | 4b9d33e6d83cc05a8005a8f9a8b9677fa0f53626 (diff) | |
| download | op-kernel-dev-06d984737bac0545fe20bb5447ee488b95adb531.zip op-kernel-dev-06d984737bac0545fe20bb5447ee488b95adb531.tar.gz | |
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 c825c6e..7312bf9 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, int error = 0; rcu_read_lock(); - tracer = tracehook_tracer_task(task); + tracer = ptrace_parent(task); if (tracer) { /* released below */ cred = get_task_cred(tracer); diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index a0d3845..fc07d18 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) u32 ptsid = 0; rcu_read_lock(); - tracer = tracehook_tracer_task(current); + tracer = ptrace_parent(current); if (likely(tracer != NULL)) { sec = __task_cred(tracer)->security; ptsid = sec->sid; @@ -5314,7 +5314,7 @@ static int selinux_setprocattr(struct task_struct *p, Otherwise, leave SID unchanged and fail. */ ptsid = 0; task_lock(p); - tracer = tracehook_tracer_task(p); + tracer = ptrace_parent(p); if (tracer) ptsid = task_sid(tracer); task_unlock(p); |
