summaryrefslogtreecommitdiff
path: root/arch
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:26:14 +0100
commitcdae704b5db2e1d58009beb0a89ed87a57f5d7f0 (patch)
tree890f4d792fcc5c3a856854e67583af9eecf91e02 /arch
parent4a5bdc546ab498a91784bf645c31264da8228829 (diff)
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>
Diffstat (limited to 'arch')
-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 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");
}