tracehook: fix CLONE_PTRACE

In the change in commit 09a05394fe2448a4139b014936330af23fa7ec83, I
overlooked two nits in the logic and this broke using CLONE_PTRACE
when PTRACE_O_TRACE* are not being used.

A parent that is itself traced at all but not using PTRACE_O_TRACE*,
using CLONE_PTRACE would have its new child fail to be traced.

A parent that is not itself traced at all that uses CLONE_PTRACE
(which should be a no-op in this case) would confuse the bookkeeping
and lead to a crash at exit time.

This restores the missing checks and fixes both failure modes.

Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Roland McGrath <roland@redhat.com>

+2 -2
+1 -1
include/linux/ptrace.h
··· 172 172 child->ptrace = 0; 173 173 if (unlikely(ptrace)) { 174 174 child->ptrace = current->ptrace; 175 - __ptrace_link(child, current->parent); 175 + ptrace_link(child, current->parent); 176 176 } 177 177 } 178 178
+1 -1
include/linux/tracehook.h
··· 280 280 unsigned long clone_flags, 281 281 pid_t pid, struct task_struct *child) 282 282 { 283 - if (unlikely(trace)) { 283 + if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) { 284 284 /* 285 285 * The child starts up with an immediate SIGSTOP. 286 286 */