Commit 9a0c0328 authored by Julien Thierry's avatar Julien Thierry Committed by Catalin Marinas

arm64: Use daifflag_restore after bp_hardening

For EL0 entries requiring bp_hardening, daif status is kept at
DAIF_PROCCTX_NOIRQ until after hardening has been done. Then interrupts
are enabled through local_irq_enable().

Before using local_irq_* functions, daifflags should be properly restored
to a state where IRQs are enabled.

Enable IRQs by restoring DAIF_PROCCTX state after bp hardening.
Acked-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarJulien Thierry <julien.thierry@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f0569291
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <asm/cmpxchg.h> #include <asm/cmpxchg.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include <asm/exception.h> #include <asm/exception.h>
#include <asm/daifflags.h>
#include <asm/debug-monitors.h> #include <asm/debug-monitors.h>
#include <asm/esr.h> #include <asm/esr.h>
#include <asm/sysreg.h> #include <asm/sysreg.h>
...@@ -776,7 +777,7 @@ asmlinkage void __exception do_el0_ia_bp_hardening(unsigned long addr, ...@@ -776,7 +777,7 @@ asmlinkage void __exception do_el0_ia_bp_hardening(unsigned long addr,
if (addr > TASK_SIZE) if (addr > TASK_SIZE)
arm64_apply_bp_hardening(); arm64_apply_bp_hardening();
local_irq_enable(); local_daif_restore(DAIF_PROCCTX);
do_mem_abort(addr, esr, regs); do_mem_abort(addr, esr, regs);
} }
...@@ -790,7 +791,7 @@ asmlinkage void __exception do_sp_pc_abort(unsigned long addr, ...@@ -790,7 +791,7 @@ asmlinkage void __exception do_sp_pc_abort(unsigned long addr,
if (user_mode(regs)) { if (user_mode(regs)) {
if (instruction_pointer(regs) > TASK_SIZE) if (instruction_pointer(regs) > TASK_SIZE)
arm64_apply_bp_hardening(); arm64_apply_bp_hardening();
local_irq_enable(); local_daif_restore(DAIF_PROCCTX);
} }
clear_siginfo(&info); clear_siginfo(&info);
......
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