Commit f9a38eac authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: let signal_delivered() do SIGTRAP on singlestepping into handler 



... rather than duplicating that in sigframe setup code (and doing that
inconsistently, at that)

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bf56d576

arch/um/kernel/signal.c

+5 −1
Original line number Diff line number Diff line
@@ -22,9 +22,13 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr, 
			 struct k_sigaction *ka, siginfo_t *info)

{

	sigset_t *oldset = sigmask_to_save();

	int singlestep = 0;

	unsigned long sp;

	int err;



	if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))

		singlestep = 1;



	/* Did we come from a system call? */

	if (PT_REGS_SYSCALL_NR(regs) >= 0) {

		/* If so, check system call restarting.. */
@@ -61,7 +65,7 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr, 
	if (err)

		force_sigsegv(signr, current);

	else

		signal_delivered(signr, info, ka, regs, 0);

		signal_delivered(signr, info, ka, regs, singlestep);

}



static int kern_do_signal(struct pt_regs *regs)

arch/x86/um/signal.c

+0 −6
Original line number Diff line number Diff line
@@ -416,9 +416,6 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig, 
	PT_REGS_AX(regs) = (unsigned long) sig;

	PT_REGS_DX(regs) = (unsigned long) 0;

	PT_REGS_CX(regs) = (unsigned long) 0;



	if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))

		ptrace_notify(SIGTRAP);

	return 0;

}
@@ -466,9 +463,6 @@ int setup_signal_stack_si(unsigned long stack_top, int sig, 
	PT_REGS_AX(regs) = (unsigned long) sig;

	PT_REGS_DX(regs) = (unsigned long) &frame->info;

	PT_REGS_CX(regs) = (unsigned long) &frame->uc;



	if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))

		ptrace_notify(SIGTRAP);

	return 0;

}