Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe1bc6a0 authored by Tejun Heo's avatar Tejun Heo
Browse files

ptrace: Add @why to ptrace_stop() 



To prepare for cleanup of the interaction between group stop and
ptrace, add @why to ptrace_stop().  Existing users are updated such
that there is no behavior change.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
parent edf2ed15

kernel/signal.c

+4 −4
Original line number Diff line number Diff line
@@ -1617,7 +1617,7 @@ static int sigkill_pending(struct task_struct *tsk) 
 * If we actually decide not to stop at all because the tracer

 * is gone, we keep current->exit_code unless clear_code.

 */

static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info)

static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)

	__releases(&current->sighand->siglock)

	__acquires(&current->sighand->siglock)

{
@@ -1655,7 +1655,7 @@ static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info) 
	spin_unlock_irq(&current->sighand->siglock);

	read_lock(&tasklist_lock);

	if (may_ptrace_stop()) {

		do_notify_parent_cldstop(current, CLD_TRAPPED);

		do_notify_parent_cldstop(current, why);

		/*

		 * Don't want to allow preemption here, because

		 * sys_ptrace() needs this task to be inactive.
@@ -1714,7 +1714,7 @@ void ptrace_notify(int exit_code) 


	/* Let the debugger run.  */

	spin_lock_irq(&current->sighand->siglock);

	ptrace_stop(exit_code, 1, &info);

	ptrace_stop(exit_code, CLD_TRAPPED, 1, &info);

	spin_unlock_irq(&current->sighand->siglock);

}
@@ -1795,7 +1795,7 @@ static int ptrace_signal(int signr, siginfo_t *info, 
	ptrace_signal_deliver(regs, cookie);



	/* Let the debugger run.  */

	ptrace_stop(signr, 0, info);

	ptrace_stop(signr, CLD_TRAPPED, 0, info);



	/* We're back.  Did the debugger cancel the sig?  */

	signr = current->exit_code;