|
Tony Jones |
ce8a99 |
From: Marco Elver <elver@google.com>
|
|
Tony Jones |
ce8a99 |
Date: Thu, 29 Apr 2021 21:07:34 +0200
|
|
Tony Jones |
ce8a99 |
Subject: arm64: Add compile-time asserts for siginfo_t offsets
|
|
Tony Jones |
ce8a99 |
Git-commit: 726e337b645478ecf41eb261fdde3e8a9476a008
|
|
Tony Jones |
ce8a99 |
Patch-mainline: v5.15-rc1
|
|
Tony Jones |
ce8a99 |
References: jsc#PED-1755 (dependent patch)
|
|
Tony Jones |
ce8a99 |
|
|
Tony Jones |
ce8a99 |
To help catch ABI breaks at compile-time, add compile-time assertions to
|
|
Tony Jones |
ce8a99 |
verify the siginfo_t layout.
|
|
Tony Jones |
ce8a99 |
|
|
Tony Jones |
ce8a99 |
Link: https://lkml.kernel.org/r/20210505141101.11519-3-ebiederm@xmission.com
|
|
Tony Jones |
ce8a99 |
Link: https://lkml.kernel.org/r/20210429190734.624918-3-elver@google.com
|
|
Tony Jones |
ce8a99 |
Link: https://lkml.kernel.org/r/87sg0fxx92.fsf_-_@disp2133
|
|
Tony Jones |
ce8a99 |
Signed-off-by: Marco Elver <elver@google.com>
|
|
Tony Jones |
ce8a99 |
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
|
|
Tony Jones |
ce8a99 |
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
Tony Jones |
ce8a99 |
---
|
|
Tony Jones |
ce8a99 |
arch/arm64/kernel/signal.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
Tony Jones |
ce8a99 |
arch/arm64/kernel/signal32.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
Tony Jones |
ce8a99 |
2 files changed, 74 insertions(+)
|
|
Tony Jones |
ce8a99 |
|
|
Tony Jones |
ce8a99 |
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
|
|
Tony Jones |
ce8a99 |
index f8192f4ae0b8..4413b6a4e32a 100644
|
|
Tony Jones |
ce8a99 |
--- a/arch/arm64/kernel/signal.c
|
|
Tony Jones |
ce8a99 |
+++ b/arch/arm64/kernel/signal.c
|
|
Tony Jones |
ce8a99 |
@@ -999,3 +999,40 @@ void __init minsigstksz_setup(void)
|
|
Tony Jones |
ce8a99 |
round_up(sizeof(struct frame_record), 16) +
|
|
Tony Jones |
ce8a99 |
16; /* max alignment padding */
|
|
Tony Jones |
ce8a99 |
}
|
|
Tony Jones |
ce8a99 |
+
|
|
Tony Jones |
ce8a99 |
+/*
|
|
Tony Jones |
ce8a99 |
+ * Compile-time assertions for siginfo_t offsets. Check NSIG* as well, as
|
|
Tony Jones |
ce8a99 |
+ * changes likely come with new fields that should be added below.
|
|
Tony Jones |
ce8a99 |
+ */
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGILL == 11);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGFPE == 15);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGSEGV == 9);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGBUS == 5);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGTRAP == 6);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGCHLD == 6);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGSYS == 2);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_signo) == 0x00);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_errno) == 0x04);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_code) == 0x08);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_pid) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_uid) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_tid) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_overrun) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_status) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_utime) == 0x20);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_stime) == 0x28);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_value) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_int) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_ptr) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_addr) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_addr_lsb) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_lower) == 0x20);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_upper) == 0x28);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_pkey) == 0x20);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_perf_data) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_perf_type) == 0x20);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_band) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_fd) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_call_addr) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_syscall) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(siginfo_t, si_arch) == 0x1c);
|
|
Tony Jones |
ce8a99 |
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
|
|
Tony Jones |
ce8a99 |
index 2f507f565c48..ab1775216712 100644
|
|
Tony Jones |
ce8a99 |
--- a/arch/arm64/kernel/signal32.c
|
|
Tony Jones |
ce8a99 |
+++ b/arch/arm64/kernel/signal32.c
|
|
Tony Jones |
ce8a99 |
@@ -457,3 +457,40 @@ void compat_setup_restart_syscall(struct pt_regs *regs)
|
|
Tony Jones |
ce8a99 |
{
|
|
Tony Jones |
ce8a99 |
regs->regs[7] = __NR_compat_restart_syscall;
|
|
Tony Jones |
ce8a99 |
}
|
|
Tony Jones |
ce8a99 |
+
|
|
Tony Jones |
ce8a99 |
+/*
|
|
Tony Jones |
ce8a99 |
+ * Compile-time assertions for siginfo_t offsets. Check NSIG* as well, as
|
|
Tony Jones |
ce8a99 |
+ * changes likely come with new fields that should be added below.
|
|
Tony Jones |
ce8a99 |
+ */
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGILL == 11);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGFPE == 15);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGSEGV == 9);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGBUS == 5);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGTRAP == 6);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGCHLD == 6);
|
|
Tony Jones |
ce8a99 |
+static_assert(NSIGSYS == 2);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_signo) == 0x00);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_errno) == 0x04);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_code) == 0x08);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_pid) == 0x0c);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_uid) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_tid) == 0x0c);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_overrun) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_status) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_utime) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_stime) == 0x1c);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_value) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_int) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_ptr) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_addr) == 0x0c);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_addr_lsb) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_lower) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_upper) == 0x18);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_pkey) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_perf_data) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_perf_type) == 0x14);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_band) == 0x0c);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_fd) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_call_addr) == 0x0c);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_syscall) == 0x10);
|
|
Tony Jones |
ce8a99 |
+static_assert(offsetof(compat_siginfo_t, si_arch) == 0x14);
|
|
Tony Jones |
ce8a99 |
|