Skip to contentSkip to conversation

ptrace_attach-shift-sendsigstop-into-ptrace_set_stopped.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Feb 22, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: ptrace_attach: shift send(SIGSTOP) into ptrace_set_stopped()
has been removed from the -mm tree. Its filename was
ptrace_attach-shift-sendsigstop-into-ptrace_set_stopped.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Oleg Nesterov <[email protected]>
Subject: ptrace_attach: shift send(SIGSTOP) into ptrace_set_stopped()
Date: Mon, 22 Jan 2024 18:16:31 +0100

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().

---

 kernel/ptrace.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
kernel/ptrace.c renamed from kernel/ptrace.c~ptrace_attach-shift-sendsigstop-into-ptrace_set_stopped +5 -8
@@ -375,10 +375,13 @@ static int check_ptrace_options(unsigned
 	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_str
 				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);
 		}
 	}
 

_

Patches currently in -mm which might be from [email protected] are