Commit 48c3538c authored by Will Deacon's avatar Will Deacon Committed by Greg Kroah-Hartman
Browse files

arm64: entry: Apply BP hardening for suspicious interrupts from EL0

Commit 30d88c0e


It is possible to take an IRQ from EL0 following a branch to a kernel
address in such a way that the IRQ is prioritised over the instruction
abort. Whilst an attacker would need to get the stars to align here,
it might be sufficient with enough calibration so perform BP hardening
in the rare case that we see a kernel address in the ELR when handling
an IRQ from EL0.
Reported-by: default avatarDan Hettena <>
Reviewed-by: default avatarMarc Zyngier <>
Signed-off-by: default avatarWill Deacon <>
Signed-off-by: default avatarCatalin Marinas <>
Signed-off-by: default avatarArd Biesheuvel <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 6b47a825
......@@ -821,6 +821,11 @@ el0_irq_naked:
tbz x22, #55, 1f
bl do_el0_irq_bp_hardening
......@@ -751,6 +751,12 @@ asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr,
arm64_notify_die("", regs, &info, esr);
asmlinkage void __exception do_el0_irq_bp_hardening(void)
/* PC has already been checked in entry.S */
asmlinkage void __exception do_el0_ia_bp_hardening(unsigned long addr,
unsigned int esr,
struct pt_regs *regs)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment