summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHari Vyas <hari.vyas@broadcom.com>2018-08-07 16:33:48 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-28 18:29:02 +0100
commit80ade6178da2033c9c939c94636e2d466d3e957c (patch)
tree574073ebe2a29d1f5295dbda7a1afb3b4cc7f780
parent5de1a7fc74309edceed5faaf18fe0f4ffd0eac89 (diff)
downloadlinux-stable-80ade6178da2033c9c939c94636e2d466d3e957c.tar.gz
linux-stable-80ade6178da2033c9c939c94636e2d466d3e957c.tar.bz2
linux-stable-80ade6178da2033c9c939c94636e2d466d3e957c.zip
arm64: fix for bad_mode() handler to always result in panic
commit e4ba15debcfd27f60d43da940a58108783bff2a6 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm64/kernel/traps.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 28bef94cf792..5962badb3346 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -611,7 +611,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
handler[reason], smp_processor_id(), esr,
esr_get_class_string(esr));
- die("Oops - bad mode", regs, 0);
local_irq_disable();
panic("bad mode");
}