Skip to content

Commit 56516a4

Browse files
melverebiederm
authored andcommitted
arm: Add compile-time asserts for siginfo_t offsets
To help catch ABI breaks at compile-time, add compile-time assertions to verify the siginfo_t layout. This could have caught that we cannot portably add 64-bit integers to siginfo_t on 32-bit architectures like Arm before reaching -next: https://lkml.kernel.org/r/20210422191823.79012-1-elver@google.com Link: https://lkml.kernel.org/r/20210429190734.624918-2-elver@google.com Link: https://lkml.kernel.org/r/20210505141101.11519-2-ebiederm@xmission.com Link: https://lkml.kernel.org/r/87y2a7xx9q.fsf_-_@disp2133 Signed-off-by: Marco Elver <elver@google.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
1 parent 42365ab commit 56516a4

1 file changed

Lines changed: 37 additions & 0 deletions

File tree

arch/arm/kernel/signal.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,3 +725,40 @@ asmlinkage void do_rseq_syscall(struct pt_regs *regs)
725725
rseq_syscall(regs);
726726
}
727727
#endif
728+
729+
/*
730+
* Compile-time assertions for siginfo_t offsets. Check NSIG* as well, as
731+
* changes likely come with new fields that should be added below.
732+
*/
733+
static_assert(NSIGILL == 11);
734+
static_assert(NSIGFPE == 15);
735+
static_assert(NSIGSEGV == 9);
736+
static_assert(NSIGBUS == 5);
737+
static_assert(NSIGTRAP == 6);
738+
static_assert(NSIGCHLD == 6);
739+
static_assert(NSIGSYS == 2);
740+
static_assert(offsetof(siginfo_t, si_signo) == 0x00);
741+
static_assert(offsetof(siginfo_t, si_errno) == 0x04);
742+
static_assert(offsetof(siginfo_t, si_code) == 0x08);
743+
static_assert(offsetof(siginfo_t, si_pid) == 0x0c);
744+
static_assert(offsetof(siginfo_t, si_uid) == 0x10);
745+
static_assert(offsetof(siginfo_t, si_tid) == 0x0c);
746+
static_assert(offsetof(siginfo_t, si_overrun) == 0x10);
747+
static_assert(offsetof(siginfo_t, si_status) == 0x14);
748+
static_assert(offsetof(siginfo_t, si_utime) == 0x18);
749+
static_assert(offsetof(siginfo_t, si_stime) == 0x1c);
750+
static_assert(offsetof(siginfo_t, si_value) == 0x14);
751+
static_assert(offsetof(siginfo_t, si_int) == 0x14);
752+
static_assert(offsetof(siginfo_t, si_ptr) == 0x14);
753+
static_assert(offsetof(siginfo_t, si_addr) == 0x0c);
754+
static_assert(offsetof(siginfo_t, si_addr_lsb) == 0x10);
755+
static_assert(offsetof(siginfo_t, si_lower) == 0x14);
756+
static_assert(offsetof(siginfo_t, si_upper) == 0x18);
757+
static_assert(offsetof(siginfo_t, si_pkey) == 0x14);
758+
static_assert(offsetof(siginfo_t, si_perf_data) == 0x10);
759+
static_assert(offsetof(siginfo_t, si_perf_type) == 0x14);
760+
static_assert(offsetof(siginfo_t, si_band) == 0x0c);
761+
static_assert(offsetof(siginfo_t, si_fd) == 0x10);
762+
static_assert(offsetof(siginfo_t, si_call_addr) == 0x0c);
763+
static_assert(offsetof(siginfo_t, si_syscall) == 0x10);
764+
static_assert(offsetof(siginfo_t, si_arch) == 0x14);

0 commit comments

Comments
 (0)