From 04459484ef65b24eeb35e1d5ee05aa2e814916db Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 11 Dec 2023 22:29:23 +0000 Subject: [PATCH] Make sure the syscall table entries are aligned on a 4-byte boundary. Required for strict-alignment architectures and a good idea on others. same as kettenis commit to libc --- libexec/ld.so/aarch64/SYS.h | 3 ++- libexec/ld.so/alpha/SYS.h | 3 ++- libexec/ld.so/amd64/SYS.h | 3 ++- libexec/ld.so/arm/SYS.h | 3 ++- libexec/ld.so/hppa/SYS.h | 3 ++- libexec/ld.so/i386/SYS.h | 3 ++- libexec/ld.so/m88k/SYS.h | 3 ++- libexec/ld.so/mips64/SYS.h | 3 ++- libexec/ld.so/powerpc/SYS.h | 3 ++- libexec/ld.so/powerpc64/SYS.h | 3 ++- libexec/ld.so/riscv64/SYS.h | 3 ++- libexec/ld.so/sh/SYS.h | 3 ++- libexec/ld.so/sparc64/SYS.h | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/libexec/ld.so/aarch64/SYS.h b/libexec/ld.so/aarch64/SYS.h index c308acf5b12..4fcae52bc98 100644 --- a/libexec/ld.so/aarch64/SYS.h +++ b/libexec/ld.so/aarch64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.6 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.7 2023/12/11 22:29:23 deraadt Exp $ */ /* * Copyright (c) 2016 Dale Rahn @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/alpha/SYS.h b/libexec/ld.so/alpha/SYS.h index 3d0d140540d..62b4d67b048 100644 --- a/libexec/ld.so/alpha/SYS.h +++ b/libexec/ld.so/alpha/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.4 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.5 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -63,6 +63,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/amd64/SYS.h b/libexec/ld.so/amd64/SYS.h index e160da92034..51c055ef40b 100644 --- a/libexec/ld.so/amd64/SYS.h +++ b/libexec/ld.so/amd64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.4 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.5 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 2002,2004 Dale Rahn @@ -32,6 +32,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/arm/SYS.h b/libexec/ld.so/arm/SYS.h index faa5804dc9b..46786154c1f 100644 --- a/libexec/ld.so/arm/SYS.h +++ b/libexec/ld.so/arm/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.5 2023/12/11 03:05:17 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.6 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 2004 Dale Rahn @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",%progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/hppa/SYS.h b/libexec/ld.so/hppa/SYS.h index 07707835a74..403daa8533f 100644 --- a/libexec/ld.so/hppa/SYS.h +++ b/libexec/ld.so/hppa/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.2 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.3 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -35,6 +35,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits !\ + .p2align 2 !\ .long label !\ .long sysno !\ .popsection diff --git a/libexec/ld.so/i386/SYS.h b/libexec/ld.so/i386/SYS.h index b714c503b27..7d09eb5652a 100644 --- a/libexec/ld.so/i386/SYS.h +++ b/libexec/ld.so/i386/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.2 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.3 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -32,6 +32,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/m88k/SYS.h b/libexec/ld.so/m88k/SYS.h index c1528b2bc3d..0db37ef11ad 100644 --- a/libexec/ld.so/m88k/SYS.h +++ b/libexec/ld.so/m88k/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.5 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.6 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 2013 Miodrag Vallat. @@ -46,6 +46,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/mips64/SYS.h b/libexec/ld.so/mips64/SYS.h index 1dbc8a7e0dc..1d5764f9a32 100644 --- a/libexec/ld.so/mips64/SYS.h +++ b/libexec/ld.so/mips64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.2 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.3 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/powerpc/SYS.h b/libexec/ld.so/powerpc/SYS.h index 9da670134f3..ba2a0f964e9 100644 --- a/libexec/ld.so/powerpc/SYS.h +++ b/libexec/ld.so/powerpc/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.5 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.6 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/powerpc64/SYS.h b/libexec/ld.so/powerpc64/SYS.h index 7671f360696..a7c3241369b 100644 --- a/libexec/ld.so/powerpc64/SYS.h +++ b/libexec/ld.so/powerpc64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.3 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.4 2023/12/11 22:29:24 deraadt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/riscv64/SYS.h b/libexec/ld.so/riscv64/SYS.h index 3d6537faeda..6bd81b7565e 100644 --- a/libexec/ld.so/riscv64/SYS.h +++ b/libexec/ld.so/riscv64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.2 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.3 2023/12/11 22:29:25 deraadt Exp $ */ /* * Copyright (c) 2016 Dale Rahn @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/sh/SYS.h b/libexec/ld.so/sh/SYS.h index 4f9350229ae..df4333c09f8 100644 --- a/libexec/ld.so/sh/SYS.h +++ b/libexec/ld.so/sh/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.3 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.4 2023/12/11 22:29:25 deraadt Exp $ */ /* * Copyright (c) 2006 Dale Rahn @@ -31,6 +31,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection diff --git a/libexec/ld.so/sparc64/SYS.h b/libexec/ld.so/sparc64/SYS.h index 7a29f2b571c..fa7e8a97acb 100644 --- a/libexec/ld.so/sparc64/SYS.h +++ b/libexec/ld.so/sparc64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.5 2023/12/10 16:45:50 deraadt Exp $ */ +/* $OpenBSD: SYS.h,v 1.6 2023/12/11 22:29:25 deraadt Exp $ */ /* $NetBSD: rtld_start.S,v 1.5 2001/08/14 22:17:48 eeh Exp $ */ /* @@ -70,6 +70,7 @@ #define PINSYSCALL(sysno, label) \ .pushsection .openbsd.syscalls,"",@progbits ;\ + .p2align 2 ;\ .long label ;\ .long sysno ;\ .popsection -- 2.20.1