Browse files

arm64: don't kill the kernel on a bad esr from el0

Rather than completely killing the kernel if we receive an esr value we
can't deal with in the el0 handlers, send the process a SIGILL and log
the esr value in the hope that we can debug it. If we receive a bad esr
from el1, we'll die() as before.

Signed-off-by: Mark Rutland <>
Signed-off-by: Catalin Marinas <>
  • Loading branch information...
Mark Rutland authored and ctmarinas committed May 28, 2013
1 parent 381cc2b commit 9955ac47f4ba1c95ecb6092aeaefb40a22e99268
Showing with 9 additions and 3 deletions.
  1. +9 −3 arch/arm64/kernel/traps.c
@@ -311,14 +311,20 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs)
asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
+ siginfo_t info;
+ void __user *pc = (void __user *)instruction_pointer(regs);
pr_crit("Bad mode in %s handler detected, code 0x%08x\n",
handler[reason], esr);
+ __show_regs(regs);
+ info.si_signo = SIGILL;
+ info.si_errno = 0;
+ info.si_code = ILL_ILLOPC;
+ info.si_addr = pc;
- die("Oops - bad mode", regs, 0);
- local_irq_disable();
- panic("bad mode");
+ arm64_notify_die("Oops - bad mode", regs, &info, 0);
void __pte_error(const char *file, int line, unsigned long val)

0 comments on commit 9955ac4

Please sign in to comment.