From a7e6f1ca90354a31946873d102cfa999ddf6ecb4 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 20 Feb 2018 18:08:40 +0000 Subject: [PATCH] arm64: signal: Force SIGKILL for unknown signals in force_signal_inject For signals other than SIGKILL or those with siginfo_layout(signal, code) == SIL_FAULT then force_signal_inject does not initialise the siginfo_t properly. Since the signal number is determined solely by the caller, simply WARN on unknown signals and force to SIGKILL. Reported-by: Dave Martin Signed-off-by: Will Deacon --- arch/arm64/kernel/traps.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index c478d8e27649..3f52c07b4bf4 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -331,6 +331,12 @@ void force_signal_inject(int signal, int code, unsigned long address) break; } + /* Force signals we don't understand to SIGKILL */ + if (WARN_ON(signal != SIGKILL || + siginfo_layout(signal, code) != SIL_FAULT)) { + signal = SIGKILL; + } + if (unhandled_signal(current, signal) && show_unhandled_signals_ratelimited()) { pr_info("%s[%d]: %s: pc=%08llx\n", -- 2.30.2