ptrace: cleanup ptrace_init_task()->ptrace_link() path
Oleg Nesterov
maintainerRFC PATCH 1/14 ptrace: cleanup ptrace_init_task()->ptrace_link() path
(already in mm: ptrace-cleanup-ptrace_init_task-ptrace_link-path.patch)
No functional changes.
ptrace_init_task() looks confusing, as if we always auto-attach when "bool ptrace" argument is true, while in fact we attach only if current is traced.
Make the code more explicit and kill now unused ptrace_link().
Signed-off-by Oleg Nesterov <[email protected]>
Acked-by Roland McGrath <[email protected]>
---
include/linux/ptrace.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
include/linux/ptrace.h renamed from include/linux/ptrace.h~1_PTRACE_INIT_TASK +3 -8
@@ -105,12 +105,7 @@ static inline int ptrace_reparented(stru {return child->real_parent != child->parent; } -static inline void ptrace_link (struct task_struct *child, -struct task_struct *new_parent) -{ -if (unlikely (child->ptrace)) -__ptrace_link (child, new_parent); -} +static inline void ptrace_unlink (struct task_struct *child) {if (unlikely (child->ptrace))
@@ -169,9 +164,9 @@ static inline void ptrace_init_task(struINIT_LIST_HEAD (&child->ptraced); child->parent = child->real_parent; child->ptrace =0 ; -if (unlikely (ptrace)) { +if (unlikely (ptrace) && (current->ptrace &PT_PTRACED )) { child->ptrace = current->ptrace; -ptrace_link (child, current->parent); +__ptrace_link (child, current->parent); } }