Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

arm64: debug: always unmask interrupts in el0_softstp()

We intend that EL0 exception handlers unmask all DAIF exceptions
before calling exit_to_user_mode().

When completing single-step of a suspended breakpoint, we do not call
local_daif_restore(DAIF_PROCCTX) before calling exit_to_user_mode(),
leaving all DAIF exceptions masked.

When pseudo-NMIs are not in use this is benign.

When pseudo-NMIs are in use, this is unsound. At this point interrupts
are masked by both DAIF.IF and PMR_EL1, and subsequent irq flag
manipulation may not work correctly. For example, a subsequent
local_irq_enable() within exit_to_user_mode_loop() will only unmask
interrupts via PMR_EL1 (leaving those masked via DAIF.IF), and
anything depending on interrupts being unmasked (e.g. delivery of
signals) will not work correctly.

This was detected by CONFIG_ARM64_DEBUG_PRIORITY_MASKING.

Move the call to `try_step_suspended_breakpoints()` outside of the check
so that interrupts can be unmasked even if we don't call the step handler.

Fixes: 0ac7584c08ce ("arm64: debug: split single stepping exception entry")
Cc: <stable@vger.kernel.org> # 6.17
Signed-off-by: Ada Couprie Diaz <ada.coupriediaz@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
[catalin.marinas@arm.com: added Mark's rewritten commit log and some whitespace]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Ada Couprie Diaz and committed by
Catalin Marinas
ea0d55ae e9ad390a

+5 -3
+5 -3
arch/arm64/kernel/entry-common.c
··· 697 697 698 698 static void noinstr el0_softstp(struct pt_regs *regs, unsigned long esr) 699 699 { 700 + bool step_done; 701 + 700 702 if (!is_ttbr0_addr(regs->pc)) 701 703 arm64_apply_bp_hardening(); 702 704 ··· 709 707 * If we are stepping a suspended breakpoint there's nothing more to do: 710 708 * the single-step is complete. 711 709 */ 712 - if (!try_step_suspended_breakpoints(regs)) { 713 - local_daif_restore(DAIF_PROCCTX); 710 + step_done = try_step_suspended_breakpoints(regs); 711 + local_daif_restore(DAIF_PROCCTX); 712 + if (!step_done) 714 713 do_el0_softstep(esr, regs); 715 - } 716 714 arm64_exit_to_user_mode(regs); 717 715 } 718 716