diff mbox series

[4.4,2/6] arm64: fix for bad_mode() handler to always result in panic

Message ID 20191127072124.30445-2-lee.jones@linaro.org
State New
Headers show
Series [4.4,1/6] can: dev: can_dellink(): remove return at end of void function | expand

Commit Message

Lee Jones Nov. 27, 2019, 7:21 a.m. UTC 
From: Hari Vyas <hari.vyas@broadcom.com>


[ Upstream commit e4ba15debcfd27f60d43da940a58108783bff2a6 ]

The bad_mode() handler is called if we encounter an uunknown exception,
with the expectation that the subsequent call to panic() will halt the
system. Unfortunately, if the exception calling bad_mode() is taken from
EL0, then the call to die() can end up killing the current user task and
calling schedule() instead of falling through to panic().

Remove the die() call altogether, since we really want to bring down the
machine in this "impossible" case.

Signed-off-by: Hari Vyas <hari.vyas@broadcom.com>

Signed-off-by: Will Deacon <will.deacon@arm.com>

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 arch/arm64/kernel/traps.c | 1 -
 1 file changed, 1 deletion(-)

-- 
2.24.0
diff mbox series

Patch

diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 6b4579e07aa2..02710f99c137 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -448,7 +448,6 @@  asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
 	pr_crit("Bad mode in %s handler detected, code 0x%08x -- %s\n",
 		handler[reason], esr, esr_get_class_string(esr));
 
-	die("Oops - bad mode", regs, 0);
 	local_irq_disable();
 	panic("bad mode");
 }