path: root/kernel/signal.c
diff options
authorMarco Elver <elver@google.com>2021-04-22 21:18:23 +0200
committerPeter Zijlstra <peterz@infradead.org>2021-04-23 09:03:16 +0200
commited8e50800bf4c2d904db9c75408a67085e6cca3d (patch)
treec104a37d1bb52459adfa6c80cce80cdd83670eb7 /kernel/signal.c
parent3ddb3fd8cdb0a6c11b7c8d91ba42d84c4ea3cc43 (diff)
signal, perf: Add missing TRAP_PERF case in siginfo_layout()
Add the missing TRAP_PERF case in siginfo_layout() for interpreting the layout correctly as SIL_PERF_EVENT instead of just SIL_FAULT. This ensures the si_perf field is copied and not just the si_addr field. This was caught and tested by running the perf_events/sigtrap_threads kselftest as a 32-bit binary with a 64-bit kernel. Fixes: fb6cc127e0b6 ("signal: Introduce TRAP_PERF si_code and si_perf to siginfo") Signed-off-by: Marco Elver <elver@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20210422191823.79012-2-elver@google.com
Diffstat (limited to 'kernel/signal.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index f68351825e5e..343d87c95c78 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3206,6 +3206,8 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code)
else if ((sig == SIGSEGV) && (si_code == SEGV_PKUERR))
+ else if ((sig == SIGTRAP) && (si_code == TRAP_PERF))
+ layout = SIL_PERF_EVENT;
else if (si_code <= NSIGPOLL)
layout = SIL_POLL;

Privacy Policy