Commit 8a60419d authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas

arm64: force_signal_inject: WARN if called from kernel context

force_signal_inject() is designed to send a fatal signal to userspace,
so WARN if the current pt_regs indicates a kernel context. This can
currently happen for the undefined instruction trap, so patch that up so
we always BUG() if we didn't have a handler.
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b8925ee2
...@@ -354,6 +354,9 @@ void force_signal_inject(int signal, int code, unsigned long address) ...@@ -354,6 +354,9 @@ void force_signal_inject(int signal, int code, unsigned long address)
const char *desc; const char *desc;
struct pt_regs *regs = current_pt_regs(); struct pt_regs *regs = current_pt_regs();
if (WARN_ON(!user_mode(regs)))
return;
clear_siginfo(&info); clear_siginfo(&info);
switch (signal) { switch (signal) {
...@@ -408,8 +411,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) ...@@ -408,8 +411,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
if (call_undef_hook(regs) == 0) if (call_undef_hook(regs) == 0)
return; return;
force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc);
BUG_ON(!user_mode(regs)); BUG_ON(!user_mode(regs));
force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc);
} }
#define __user_cache_maint(insn, address, res) \ #define __user_cache_maint(insn, address, res) \
......
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