ptrace_attach: shift send(SIGSTOP) into ptrace_set_stopped()
Oleg Nesterov
maintainerPATCH 1/1 ptrace_attach: shift send(SIGSTOP) into ptrace_set_stopped()
Turn send_sig_info(SIGSTOP) into send_signal_locked(SIGSTOP) and move it from ptrace_attach() to ptrace_set_stopped().
This looks more logical and avoids lock(siglock) right after unlock().
Signed-off-by Oleg Nesterov <[email protected]>
--- kernel/ptrace.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
kernel/ptrace.c +5 -8
@@ -375,10 +375,13 @@ static int check_ptrace_options(unsigned long data)return 0 ; } -static inline void ptrace_set_stopped (struct task_struct *task) +static inline void ptrace_set_stopped (struct task_struct *task,bool seize) {guard (spinlock)(&task->sighand->siglock); +/* SEIZE doesn't trap tracee on attach */ +if (!seize) +send_signal_locked (SIGSTOP ,SEND_SIG_PRIV , task,PIDTYPE_PID );/* * If the task is already STOPPED, set JOBCTL_TRAP_STOP and * TRAPPING, and kick it so that it transits to TRACED. TRAPPING
@@ -457,14 +460,8 @@ static int ptrace_attach(struct task_struct *task, long request,return -EPERM ; task->ptrace = flags; -ptrace_link (task, current); - -/* SEIZE doesn't trap tracee on attach */ -if (!seize) -send_sig_info (SIGSTOP ,SEND_SIG_PRIV , task); - -ptrace_set_stopped (task); +ptrace_set_stopped (task, seize); } }
Signature · 1 line
2.25.1.362.g51ebf55