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

Commit adeb68ef authored by Will Deacon's avatar Will Deacon
Browse files

arm64: debug: report TRAP_TRACE instead of TRAP_HWBRPT for singlestep 



Single-step traps to userspace (e.g. via ptrace) are expected to use
the TRAP_TRACE for the si_code field of the siginfo, as opposed to
TRAP_HWBRPT that we report currently.

Fix the reported value, which has no effect on existing and legacy
builds of GDB.

Reported-by: default avatarYao Qi <yao.qi@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent a9be2ee0

arch/arm64/kernel/debug-monitors.c

+2 −2
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int single_step_handler(unsigned long addr, unsigned int esr, 
		return 0;



	if (user_mode(regs)) {

		send_user_sigtrap(TRAP_HWBKPT);

		send_user_sigtrap(TRAP_TRACE);



		/*

		 * ptrace will disable single step unless explicitly
@@ -364,7 +364,7 @@ NOKPROBE_SYMBOL(aarch32_break_handler); 
static int __init debug_traps_init(void)

{

	hook_debug_fault_code(DBG_ESR_EVT_HWSS, single_step_handler, SIGTRAP,

			      TRAP_HWBKPT, "single-step handler");

			      TRAP_TRACE, "single-step handler");

	hook_debug_fault_code(DBG_ESR_EVT_BRK, brk_handler, SIGTRAP,

			      TRAP_BRKPT, "ptrace BRK handler");

	return 0;