* [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo @ 2020-10-17 0:12 Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 1/8] parisc: Drop parisc special case for __sighandler_t Peter Collingbourne ` (7 more replies) 0 siblings, 8 replies; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett The kernel currently clears the tag bits (i.e. bits 56-63) in the fault address exposed via siginfo.si_addr and sigcontext.fault_address. However, the tag bits may be needed by tools in order to accurately diagnose memory errors, such as HWASan [1] or future tools based on the Memory Tagging Extension (MTE). We should not stop clearing these bits in the existing fault address fields, because there may be existing userspace applications that are expecting the tag bits to be cleared. Instead, create a new pair of union fields in siginfo._sigfault, and store the tag bits of FAR_EL1 there, together with a mask specifying which bits are valid. However, one does not simply add fields to siginfo, at least not without a mechanism for userspace to detect that they are present and valid. Therefore, the first seven patches in this series introduce a mechanism for userspace to detect the presence of our new siginfo fields, and the last patch uses it to advertise the presence of said fields. The series can be viewed on Gerrit here: https://linux-review.googlesource.com/q/Ia8876bad8c798e0a32df7c2ce1256c4771c81446 [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html Helge Deller (1): parisc: Drop parisc special case for __sighandler_t Peter Collingbourne (7): parisc: start using signal-defs.h arch: move SA_* definitions to generic headers signal: clear non-uapi flag bits when passing/returning sa_flags signal: define the SA_UNSUPPORTED bit in sa_flags signal: deduplicate code dealing with common _sigfault fields signal: define the field siginfo.si_xflags arm64: expose FAR_EL1 tag bits in siginfo Documentation/arm64/tagged-pointers.rst | 21 +++- arch/alpha/include/uapi/asm/signal.h | 14 --- arch/arm/include/asm/signal.h | 2 + arch/arm/include/uapi/asm/signal.h | 28 +---- arch/arm64/include/asm/exception.h | 2 +- arch/arm64/include/asm/signal.h | 19 +++ arch/arm64/include/asm/system_misc.h | 2 +- arch/arm64/include/asm/traps.h | 6 +- arch/arm64/kernel/debug-monitors.c | 5 +- arch/arm64/kernel/entry-common.c | 2 - arch/arm64/kernel/ptrace.c | 7 +- arch/arm64/kernel/sys_compat.c | 5 +- arch/arm64/kernel/traps.c | 29 ++--- arch/arm64/mm/fault.c | 68 ++++++----- arch/h8300/include/uapi/asm/signal.h | 24 ---- arch/ia64/include/uapi/asm/signal.h | 24 ---- arch/m68k/include/uapi/asm/signal.h | 24 ---- arch/mips/include/uapi/asm/signal.h | 12 -- arch/parisc/include/asm/signal.h | 2 + arch/parisc/include/uapi/asm/signal.h | 34 +----- arch/powerpc/include/uapi/asm/signal.h | 24 ---- arch/powerpc/platforms/powernv/vas-fault.c | 1 + arch/s390/include/uapi/asm/signal.h | 24 ---- arch/sparc/include/uapi/asm/signal.h | 4 +- arch/x86/include/uapi/asm/signal.h | 24 ---- arch/x86/kernel/signal_compat.c | 19 +-- arch/xtensa/include/uapi/asm/signal.h | 24 ---- include/linux/compat.h | 4 + include/linux/signal.h | 29 +++++ include/linux/signal_types.h | 12 ++ include/uapi/asm-generic/siginfo.h | 14 +++ include/uapi/asm-generic/signal-defs.h | 58 +++++++++ include/uapi/asm-generic/signal.h | 29 ----- include/uapi/linux/ptrace.h | 12 ++ kernel/ptrace.c | 32 ++++- kernel/signal.c | 134 +++++++++++---------- 36 files changed, 345 insertions(+), 429 deletions(-) create mode 100644 arch/arm64/include/asm/signal.h -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v12 1/8] parisc: Drop parisc special case for __sighandler_t 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 2/8] parisc: start using signal-defs.h Peter Collingbourne ` (6 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett From: Helge Deller <deller@gmx.de> I believe we can and *should* drop this parisc-specific typedef for __sighandler_t when compiling a 64-bit kernel. The reasons: 1. We don't have a 64-bit userspace yet, so nothing (on userspace side) can break. 2. Inside the Linux kernel, this is only used in kernel/signal.c, in function kernel_sigaction() where the signal handler is compared against SIG_IGN. SIG_IGN is defined as (__sighandler_t)1), so only the pointers are compared. 3. Even when a 64-bit userspace gets added at some point, I think __sighandler_t should be defined what it is: a function pointer struct. I compiled kernel/signal.c with and without the patch, and the produced code is identical in both cases. Signed-off-by: Helge Deller <deller@gmx.de> Reviewed-by: Peter Collingbourne <pcc@google.com> Link: https://linux-review.googlesource.com/id/I21c43f21b264f339e3aa395626af838646f62d97 --- arch/parisc/include/uapi/asm/signal.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index e605197b462c..d9c51769851a 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -85,16 +85,8 @@ struct siginfo; /* Type of a signal handler. */ -#if defined(__LP64__) -/* function pointers on 64-bit parisc are pointers to little structs and the - * compiler doesn't support code which changes or tests the address of - * the function in the little struct. This is really ugly -PB - */ -typedef char __user *__sighandler_t; -#else typedef void __signalfn_t(int); typedef __signalfn_t __user *__sighandler_t; -#endif typedef struct sigaltstack { void __user *ss_sp; -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v12 2/8] parisc: start using signal-defs.h 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 1/8] parisc: Drop parisc special case for __sighandler_t Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 3/8] arch: move SA_* definitions to generic headers Peter Collingbourne ` (5 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett We currently include signal-defs.h on all architectures except parisc. Make parisc fall in line. This will make maintenance easier once the flag bits are moved here. Signed-off-by: Peter Collingbourne <pcc@google.com> Acked-by: Helge Deller <deller@gmx.de> Link: https://linux-review.googlesource.com/id/If03a5135fb514fe96548fb74610e6c3586a04064 --- arch/parisc/include/uapi/asm/signal.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index d9c51769851a..9e6f87bc8a73 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -68,14 +68,7 @@ #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 - -#define SIG_BLOCK 0 /* for blocking signals */ -#define SIG_UNBLOCK 1 /* for unblocking signals */ -#define SIG_SETMASK 2 /* for setting the signal mask */ - -#define SIG_DFL ((__sighandler_t)0) /* default signal handling */ -#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ -#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ +#include <asm-generic/signal-defs.h> # ifndef __ASSEMBLY__ @@ -84,10 +77,6 @@ /* Avoid too many header ordering problems. */ struct siginfo; -/* Type of a signal handler. */ -typedef void __signalfn_t(int); -typedef __signalfn_t __user *__sighandler_t; - typedef struct sigaltstack { void __user *ss_sp; int ss_flags; -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v12 3/8] arch: move SA_* definitions to generic headers 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 1/8] parisc: Drop parisc special case for __sighandler_t Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 2/8] parisc: start using signal-defs.h Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-11-02 17:23 ` Dave Martin 2020-10-17 0:12 ` [PATCH v12 4/8] signal: clear non-uapi flag bits when passing/returning sa_flags Peter Collingbourne ` (4 subsequent siblings) 7 siblings, 1 reply; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett, Geert Uytterhoeven Most architectures with the exception of alpha, mips, parisc and sparc use the same values for these flags. Move their definitions into asm-generic/signal-defs.h and allow the architectures with non-standard values to override them. Also, document the non-standard flag values in order to make it easier to add new generic flags in the future. A consequence of this change is that on powerpc and x86, the constants' values aside from SA_RESETHAND change signedness from unsigned to signed. This is not expected to impact realistic use of these constants. In particular the typical use of the constants where they are or'ed together and assigned to sa_flags (or another int variable) would not be affected. Signed-off-by: Peter Collingbourne <pcc@google.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://linux-review.googlesource.com/id/Ia3849f18b8009bf41faca374e701cdca36974528 --- v11: - tweak the commit message to point out the change from unsigned to signed v10: - move the comments around and add one for SA_SIGINFO arch/alpha/include/uapi/asm/signal.h | 14 -------- arch/arm/include/uapi/asm/signal.h | 28 ++------------- arch/h8300/include/uapi/asm/signal.h | 24 ------------- arch/ia64/include/uapi/asm/signal.h | 24 ------------- arch/m68k/include/uapi/asm/signal.h | 24 ------------- arch/mips/include/uapi/asm/signal.h | 12 ------- arch/parisc/include/uapi/asm/signal.h | 13 ------- arch/powerpc/include/uapi/asm/signal.h | 24 ------------- arch/s390/include/uapi/asm/signal.h | 24 ------------- arch/sparc/include/uapi/asm/signal.h | 4 +-- arch/x86/include/uapi/asm/signal.h | 24 ------------- arch/xtensa/include/uapi/asm/signal.h | 24 ------------- include/uapi/asm-generic/signal-defs.h | 47 ++++++++++++++++++++++++++ include/uapi/asm-generic/signal.h | 29 ---------------- 14 files changed, 51 insertions(+), 264 deletions(-) diff --git a/arch/alpha/include/uapi/asm/signal.h b/arch/alpha/include/uapi/asm/signal.h index 74c750bf1c1a..a69dd8d080a8 100644 --- a/arch/alpha/include/uapi/asm/signal.h +++ b/arch/alpha/include/uapi/asm/signal.h @@ -60,20 +60,6 @@ typedef unsigned long sigset_t; #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ - #define SA_ONSTACK 0x00000001 #define SA_RESTART 0x00000002 #define SA_NOCLDSTOP 0x00000004 diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h index 9b4185ba4f8a..7727f0984d26 100644 --- a/arch/arm/include/uapi/asm/signal.h +++ b/arch/arm/include/uapi/asm/signal.h @@ -60,33 +60,11 @@ typedef unsigned long sigset_t; #define SIGSWI 32 /* - * SA_FLAGS values: - * - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_SIGINFO deliver the signal with SIGINFO structs - * SA_THIRTYTWO delivers the signal in 32-bit mode, even if the task - * is running in 26-bit. - * SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)). - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NODEFER prevents the current signal from being masked in the handler. - * SA_RESETHAND clears the handler when the signal is delivered. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. + * SA_THIRTYTWO historically meant deliver the signal in 32-bit mode, even if + * the task is running in 26-bit. But since the kernel no longer supports + * 26-bit mode, the flag has no effect. */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 #define SA_THIRTYTWO 0x02000000 -#define SA_RESTORER 0x04000000 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 diff --git a/arch/h8300/include/uapi/asm/signal.h b/arch/h8300/include/uapi/asm/signal.h index e15521037348..2cd0dce2b6a6 100644 --- a/arch/h8300/include/uapi/asm/signal.h +++ b/arch/h8300/include/uapi/asm/signal.h @@ -57,30 +57,6 @@ typedef unsigned long sigset_t; #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 /* not supported yet */ -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define SA_RESTORER 0x04000000 #define MINSIGSTKSZ 2048 diff --git a/arch/ia64/include/uapi/asm/signal.h b/arch/ia64/include/uapi/asm/signal.h index aa98ff1b9e22..38166a88e4c9 100644 --- a/arch/ia64/include/uapi/asm/signal.h +++ b/arch/ia64/include/uapi/asm/signal.h @@ -53,30 +53,6 @@ #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define SA_RESTORER 0x04000000 /* diff --git a/arch/m68k/include/uapi/asm/signal.h b/arch/m68k/include/uapi/asm/signal.h index 915cc755a184..4619291df601 100644 --- a/arch/m68k/include/uapi/asm/signal.h +++ b/arch/m68k/include/uapi/asm/signal.h @@ -57,30 +57,6 @@ typedef unsigned long sigset_t; #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h index 53104b10aae2..e6c78a15cb2f 100644 --- a/arch/mips/include/uapi/asm/signal.h +++ b/arch/mips/include/uapi/asm/signal.h @@ -62,18 +62,6 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ #define SIGRTMAX _NSIG /* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - * * SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever * supported its use and no libc was using it, so the entire sa-restorer * functionality was removed with lmo commit 39bffc12c3580ab for 2.5.48 diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index 9e6f87bc8a73..e5a2657477ac 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -41,19 +41,6 @@ #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ #define SA_ONSTACK 0x00000001 #define SA_RESETHAND 0x00000004 #define SA_NOCLDSTOP 0x00000008 diff --git a/arch/powerpc/include/uapi/asm/signal.h b/arch/powerpc/include/uapi/asm/signal.h index 85b0a7aa43e7..04873dd311c2 100644 --- a/arch/powerpc/include/uapi/asm/signal.h +++ b/arch/powerpc/include/uapi/asm/signal.h @@ -60,30 +60,6 @@ typedef struct { #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK is not currently supported, but will allow sigaltstack(2). - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001U -#define SA_NOCLDWAIT 0x00000002U -#define SA_SIGINFO 0x00000004U -#define SA_ONSTACK 0x08000000U -#define SA_RESTART 0x10000000U -#define SA_NODEFER 0x40000000U -#define SA_RESETHAND 0x80000000U - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define SA_RESTORER 0x04000000U #define MINSIGSTKSZ 2048 diff --git a/arch/s390/include/uapi/asm/signal.h b/arch/s390/include/uapi/asm/signal.h index 9a14a611ed82..0189f326aac5 100644 --- a/arch/s390/include/uapi/asm/signal.h +++ b/arch/s390/include/uapi/asm/signal.h @@ -65,30 +65,6 @@ typedef unsigned long sigset_t; #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define SA_RESTORER 0x04000000 #define MINSIGSTKSZ 2048 diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h index ff9505923b9a..53758d53ac0e 100644 --- a/arch/sparc/include/uapi/asm/signal.h +++ b/arch/sparc/include/uapi/asm/signal.h @@ -137,13 +137,11 @@ struct sigstack { #define SA_STACK _SV_SSTACK #define SA_ONSTACK _SV_SSTACK #define SA_RESTART _SV_INTR -#define SA_ONESHOT _SV_RESET +#define SA_RESETHAND _SV_RESET #define SA_NODEFER 0x20u #define SA_NOCLDWAIT 0x100u #define SA_SIGINFO 0x200u -#define SA_NOMASK SA_NODEFER - #define SIG_BLOCK 0x01 /* for blocking signals */ #define SIG_UNBLOCK 0x02 /* for unblocking signals */ #define SIG_SETMASK 0x04 /* for setting the signal mask */ diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm/signal.h index e5745d593dc7..164a22a72984 100644 --- a/arch/x86/include/uapi/asm/signal.h +++ b/arch/x86/include/uapi/asm/signal.h @@ -62,30 +62,6 @@ typedef unsigned long sigset_t; #define SIGRTMIN 32 #define SIGRTMAX _NSIG -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001u -#define SA_NOCLDWAIT 0x00000002u -#define SA_SIGINFO 0x00000004u -#define SA_ONSTACK 0x08000000u -#define SA_RESTART 0x10000000u -#define SA_NODEFER 0x40000000u -#define SA_RESETHAND 0x80000000u - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define SA_RESTORER 0x04000000 #define MINSIGSTKSZ 2048 diff --git a/arch/xtensa/include/uapi/asm/signal.h b/arch/xtensa/include/uapi/asm/signal.h index 005dec5bfde4..79ddabaa4e5d 100644 --- a/arch/xtensa/include/uapi/asm/signal.h +++ b/arch/xtensa/include/uapi/asm/signal.h @@ -72,30 +72,6 @@ typedef struct { #define SIGRTMIN 32 #define SIGRTMAX (_NSIG-1) -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 /* not supported yet */ -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #define SA_RESTORER 0x04000000 #define MINSIGSTKSZ 2048 diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h index e9304c95ceea..493953fe319b 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -4,6 +4,53 @@ #include <linux/compiler.h> +/* + * SA_FLAGS values: + * + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. + * SA_SIGINFO delivers the signal with SIGINFO structs. + * SA_ONSTACK indicates that a registered stack_t will be used. + * SA_RESTART flag to get restarting signals (which were the default long ago) + * SA_NODEFER prevents the current signal from being masked in the handler. + * SA_RESETHAND clears the handler when the signal is delivered. + * + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single + * Unix names RESETHAND and NODEFER respectively. + * + * The following bits are used in architecture-specific SA_* definitions and + * should be avoided for new generic flags: 3, 4, 5, 6, 7, 8, 9, 16, 24, 25, 26. + */ +#ifndef SA_NOCLDSTOP +#define SA_NOCLDSTOP 0x00000001 +#endif +#ifndef SA_NOCLDWAIT +#define SA_NOCLDWAIT 0x00000002 +#endif +#ifndef SA_SIGINFO +#define SA_SIGINFO 0x00000004 +#endif +#ifndef SA_ONSTACK +#define SA_ONSTACK 0x08000000 +#endif +#ifndef SA_RESTART +#define SA_RESTART 0x10000000 +#endif +#ifndef SA_NODEFER +#define SA_NODEFER 0x40000000 +#endif +#ifndef SA_RESETHAND +#define SA_RESETHAND 0x80000000 +#endif + +#define SA_NOMASK SA_NODEFER +#define SA_ONESHOT SA_RESETHAND + +/* + * New architectures should not define the obsolete + * SA_RESTORER 0x04000000 + */ + #ifndef SIG_BLOCK #define SIG_BLOCK 0 /* for blocking signals */ #endif diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h index 5c716a952cbe..f634822906e4 100644 --- a/include/uapi/asm-generic/signal.h +++ b/include/uapi/asm-generic/signal.h @@ -52,35 +52,6 @@ #define SIGRTMAX _NSIG #endif -/* - * SA_FLAGS values: - * - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_NODEFER prevents the current signal from being masked in the handler. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - -/* - * New architectures should not define the obsolete - * SA_RESTORER 0x04000000 - */ - #if !defined MINSIGSTKSZ || !defined SIGSTKSZ #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v12 3/8] arch: move SA_* definitions to generic headers 2020-10-17 0:12 ` [PATCH v12 3/8] arch: move SA_* definitions to generic headers Peter Collingbourne @ 2020-11-02 17:23 ` Dave Martin 0 siblings, 0 replies; 17+ messages in thread From: Dave Martin @ 2020-11-02 17:23 UTC (permalink / raw) To: Peter Collingbourne Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, Geert Uytterhoeven, linux-api, David Spickett, Linux ARM, Richard Henderson On Fri, Oct 16, 2020 at 05:12:28PM -0700, Peter Collingbourne wrote: > Most architectures with the exception of alpha, mips, parisc and > sparc use the same values for these flags. Move their definitions into > asm-generic/signal-defs.h and allow the architectures with non-standard > values to override them. Also, document the non-standard flag values > in order to make it easier to add new generic flags in the future. > > A consequence of this change is that on powerpc and x86, the constants' > values aside from SA_RESETHAND change signedness from unsigned > to signed. This is not expected to impact realistic use of these > constants. In particular the typical use of the constants where they > are or'ed together and assigned to sa_flags (or another int variable) > would not be affected. > > Signed-off-by: Peter Collingbourne <pcc@google.com> > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> I haven't checked exhaustively that all the constant values definitely match up, or that every arch to which this change is applicable has been patched, but where I have looked, it checks out. But otherwise, this looks reasonable to me. Reviewed-by: Dave Martin <Dave.Martin@arm.com> > Link: https://linux-review.googlesource.com/id/Ia3849f18b8009bf41faca374e701cdca36974528 > --- > v11: > - tweak the commit message to point out the change from unsigned > to signed > > v10: > - move the comments around and add one for SA_SIGINFO > > arch/alpha/include/uapi/asm/signal.h | 14 -------- > arch/arm/include/uapi/asm/signal.h | 28 ++------------- > arch/h8300/include/uapi/asm/signal.h | 24 ------------- > arch/ia64/include/uapi/asm/signal.h | 24 ------------- > arch/m68k/include/uapi/asm/signal.h | 24 ------------- > arch/mips/include/uapi/asm/signal.h | 12 ------- > arch/parisc/include/uapi/asm/signal.h | 13 ------- > arch/powerpc/include/uapi/asm/signal.h | 24 ------------- > arch/s390/include/uapi/asm/signal.h | 24 ------------- > arch/sparc/include/uapi/asm/signal.h | 4 +-- > arch/x86/include/uapi/asm/signal.h | 24 ------------- > arch/xtensa/include/uapi/asm/signal.h | 24 ------------- > include/uapi/asm-generic/signal-defs.h | 47 ++++++++++++++++++++++++++ > include/uapi/asm-generic/signal.h | 29 ---------------- > 14 files changed, 51 insertions(+), 264 deletions(-) > > diff --git a/arch/alpha/include/uapi/asm/signal.h b/arch/alpha/include/uapi/asm/signal.h > index 74c750bf1c1a..a69dd8d080a8 100644 > --- a/arch/alpha/include/uapi/asm/signal.h > +++ b/arch/alpha/include/uapi/asm/signal.h > @@ -60,20 +60,6 @@ typedef unsigned long sigset_t; > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > - > #define SA_ONSTACK 0x00000001 > #define SA_RESTART 0x00000002 > #define SA_NOCLDSTOP 0x00000004 > diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h > index 9b4185ba4f8a..7727f0984d26 100644 > --- a/arch/arm/include/uapi/asm/signal.h > +++ b/arch/arm/include/uapi/asm/signal.h > @@ -60,33 +60,11 @@ typedef unsigned long sigset_t; > #define SIGSWI 32 > > /* > - * SA_FLAGS values: > - * > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_SIGINFO deliver the signal with SIGINFO structs > - * SA_THIRTYTWO delivers the signal in 32-bit mode, even if the task > - * is running in 26-bit. > - * SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)). > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > + * SA_THIRTYTWO historically meant deliver the signal in 32-bit mode, even if > + * the task is running in 26-bit. But since the kernel no longer supports > + * 26-bit mode, the flag has no effect. > */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 > -#define SA_SIGINFO 0x00000004 > #define SA_THIRTYTWO 0x02000000 > -#define SA_RESTORER 0x04000000 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > > #define MINSIGSTKSZ 2048 > #define SIGSTKSZ 8192 > diff --git a/arch/h8300/include/uapi/asm/signal.h b/arch/h8300/include/uapi/asm/signal.h > index e15521037348..2cd0dce2b6a6 100644 > --- a/arch/h8300/include/uapi/asm/signal.h > +++ b/arch/h8300/include/uapi/asm/signal.h > @@ -57,30 +57,6 @@ typedef unsigned long sigset_t; > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 /* not supported yet */ > -#define SA_SIGINFO 0x00000004 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define SA_RESTORER 0x04000000 > > #define MINSIGSTKSZ 2048 > diff --git a/arch/ia64/include/uapi/asm/signal.h b/arch/ia64/include/uapi/asm/signal.h > index aa98ff1b9e22..38166a88e4c9 100644 > --- a/arch/ia64/include/uapi/asm/signal.h > +++ b/arch/ia64/include/uapi/asm/signal.h > @@ -53,30 +53,6 @@ > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 > -#define SA_SIGINFO 0x00000004 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define SA_RESTORER 0x04000000 > > /* > diff --git a/arch/m68k/include/uapi/asm/signal.h b/arch/m68k/include/uapi/asm/signal.h > index 915cc755a184..4619291df601 100644 > --- a/arch/m68k/include/uapi/asm/signal.h > +++ b/arch/m68k/include/uapi/asm/signal.h > @@ -57,30 +57,6 @@ typedef unsigned long sigset_t; > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 > -#define SA_SIGINFO 0x00000004 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define MINSIGSTKSZ 2048 > #define SIGSTKSZ 8192 > > diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h > index 53104b10aae2..e6c78a15cb2f 100644 > --- a/arch/mips/include/uapi/asm/signal.h > +++ b/arch/mips/include/uapi/asm/signal.h > @@ -62,18 +62,6 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ > #define SIGRTMAX _NSIG > > /* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - * > * SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever > * supported its use and no libc was using it, so the entire sa-restorer > * functionality was removed with lmo commit 39bffc12c3580ab for 2.5.48 > diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h > index 9e6f87bc8a73..e5a2657477ac 100644 > --- a/arch/parisc/include/uapi/asm/signal.h > +++ b/arch/parisc/include/uapi/asm/signal.h > @@ -41,19 +41,6 @@ > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > #define SA_ONSTACK 0x00000001 > #define SA_RESETHAND 0x00000004 > #define SA_NOCLDSTOP 0x00000008 > diff --git a/arch/powerpc/include/uapi/asm/signal.h b/arch/powerpc/include/uapi/asm/signal.h > index 85b0a7aa43e7..04873dd311c2 100644 > --- a/arch/powerpc/include/uapi/asm/signal.h > +++ b/arch/powerpc/include/uapi/asm/signal.h > @@ -60,30 +60,6 @@ typedef struct { > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK is not currently supported, but will allow sigaltstack(2). > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001U > -#define SA_NOCLDWAIT 0x00000002U > -#define SA_SIGINFO 0x00000004U > -#define SA_ONSTACK 0x08000000U > -#define SA_RESTART 0x10000000U > -#define SA_NODEFER 0x40000000U > -#define SA_RESETHAND 0x80000000U > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define SA_RESTORER 0x04000000U > > #define MINSIGSTKSZ 2048 > diff --git a/arch/s390/include/uapi/asm/signal.h b/arch/s390/include/uapi/asm/signal.h > index 9a14a611ed82..0189f326aac5 100644 > --- a/arch/s390/include/uapi/asm/signal.h > +++ b/arch/s390/include/uapi/asm/signal.h > @@ -65,30 +65,6 @@ typedef unsigned long sigset_t; > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 > -#define SA_SIGINFO 0x00000004 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define SA_RESTORER 0x04000000 > > #define MINSIGSTKSZ 2048 > diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h > index ff9505923b9a..53758d53ac0e 100644 > --- a/arch/sparc/include/uapi/asm/signal.h > +++ b/arch/sparc/include/uapi/asm/signal.h > @@ -137,13 +137,11 @@ struct sigstack { > #define SA_STACK _SV_SSTACK > #define SA_ONSTACK _SV_SSTACK > #define SA_RESTART _SV_INTR > -#define SA_ONESHOT _SV_RESET > +#define SA_RESETHAND _SV_RESET > #define SA_NODEFER 0x20u > #define SA_NOCLDWAIT 0x100u > #define SA_SIGINFO 0x200u > > -#define SA_NOMASK SA_NODEFER > - > #define SIG_BLOCK 0x01 /* for blocking signals */ > #define SIG_UNBLOCK 0x02 /* for unblocking signals */ > #define SIG_SETMASK 0x04 /* for setting the signal mask */ > diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm/signal.h > index e5745d593dc7..164a22a72984 100644 > --- a/arch/x86/include/uapi/asm/signal.h > +++ b/arch/x86/include/uapi/asm/signal.h > @@ -62,30 +62,6 @@ typedef unsigned long sigset_t; > #define SIGRTMIN 32 > #define SIGRTMAX _NSIG > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001u > -#define SA_NOCLDWAIT 0x00000002u > -#define SA_SIGINFO 0x00000004u > -#define SA_ONSTACK 0x08000000u > -#define SA_RESTART 0x10000000u > -#define SA_NODEFER 0x40000000u > -#define SA_RESETHAND 0x80000000u > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define SA_RESTORER 0x04000000 > > #define MINSIGSTKSZ 2048 > diff --git a/arch/xtensa/include/uapi/asm/signal.h b/arch/xtensa/include/uapi/asm/signal.h > index 005dec5bfde4..79ddabaa4e5d 100644 > --- a/arch/xtensa/include/uapi/asm/signal.h > +++ b/arch/xtensa/include/uapi/asm/signal.h > @@ -72,30 +72,6 @@ typedef struct { > #define SIGRTMIN 32 > #define SIGRTMAX (_NSIG-1) > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 /* not supported yet */ > -#define SA_SIGINFO 0x00000004 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > #define SA_RESTORER 0x04000000 > > #define MINSIGSTKSZ 2048 > diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h > index e9304c95ceea..493953fe319b 100644 > --- a/include/uapi/asm-generic/signal-defs.h > +++ b/include/uapi/asm-generic/signal-defs.h > @@ -4,6 +4,53 @@ > > #include <linux/compiler.h> > > +/* > + * SA_FLAGS values: > + * > + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > + * SA_SIGINFO delivers the signal with SIGINFO structs. > + * SA_ONSTACK indicates that a registered stack_t will be used. > + * SA_RESTART flag to get restarting signals (which were the default long ago) > + * SA_NODEFER prevents the current signal from being masked in the handler. > + * SA_RESETHAND clears the handler when the signal is delivered. > + * > + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > + * Unix names RESETHAND and NODEFER respectively. > + * > + * The following bits are used in architecture-specific SA_* definitions and > + * should be avoided for new generic flags: 3, 4, 5, 6, 7, 8, 9, 16, 24, 25, 26. > + */ > +#ifndef SA_NOCLDSTOP > +#define SA_NOCLDSTOP 0x00000001 > +#endif > +#ifndef SA_NOCLDWAIT > +#define SA_NOCLDWAIT 0x00000002 > +#endif > +#ifndef SA_SIGINFO > +#define SA_SIGINFO 0x00000004 > +#endif > +#ifndef SA_ONSTACK > +#define SA_ONSTACK 0x08000000 > +#endif > +#ifndef SA_RESTART > +#define SA_RESTART 0x10000000 > +#endif > +#ifndef SA_NODEFER > +#define SA_NODEFER 0x40000000 > +#endif > +#ifndef SA_RESETHAND > +#define SA_RESETHAND 0x80000000 > +#endif > + > +#define SA_NOMASK SA_NODEFER > +#define SA_ONESHOT SA_RESETHAND > + > +/* > + * New architectures should not define the obsolete > + * SA_RESTORER 0x04000000 > + */ > + > #ifndef SIG_BLOCK > #define SIG_BLOCK 0 /* for blocking signals */ > #endif > diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h > index 5c716a952cbe..f634822906e4 100644 > --- a/include/uapi/asm-generic/signal.h > +++ b/include/uapi/asm-generic/signal.h > @@ -52,35 +52,6 @@ > #define SIGRTMAX _NSIG > #endif > > -/* > - * SA_FLAGS values: > - * > - * SA_ONSTACK indicates that a registered stack_t will be used. > - * SA_RESTART flag to get restarting signals (which were the default long ago) > - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. > - * SA_RESETHAND clears the handler when the signal is delivered. > - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. > - * SA_NODEFER prevents the current signal from being masked in the handler. > - * > - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > - * Unix names RESETHAND and NODEFER respectively. > - */ > -#define SA_NOCLDSTOP 0x00000001 > -#define SA_NOCLDWAIT 0x00000002 > -#define SA_SIGINFO 0x00000004 > -#define SA_ONSTACK 0x08000000 > -#define SA_RESTART 0x10000000 > -#define SA_NODEFER 0x40000000 > -#define SA_RESETHAND 0x80000000 > - > -#define SA_NOMASK SA_NODEFER > -#define SA_ONESHOT SA_RESETHAND > - > -/* > - * New architectures should not define the obsolete > - * SA_RESTORER 0x04000000 > - */ > - > #if !defined MINSIGSTKSZ || !defined SIGSTKSZ > #define MINSIGSTKSZ 2048 > #define SIGSTKSZ 8192 > -- > 2.29.0.rc1.297.gfa9743e501-goog > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v12 4/8] signal: clear non-uapi flag bits when passing/returning sa_flags 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne ` (2 preceding siblings ...) 2020-10-17 0:12 ` [PATCH v12 3/8] arch: move SA_* definitions to generic headers Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-11-02 17:26 ` Dave Martin 2020-10-17 0:12 ` [PATCH v12 5/8] signal: define the SA_UNSUPPORTED bit in sa_flags Peter Collingbourne ` (3 subsequent siblings) 7 siblings, 1 reply; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett Previously we were not clearing non-uapi flag bits in sigaction.sa_flags when storing the userspace-provided sa_flags or when returning them via oldact. Start doing so. This allows userspace to detect missing support for flag bits and allows the kernel to use non-uapi bits internally, as we are already doing in arch/x86 for two flag bits. Now that this change is in place, we no longer need the code in arch/x86 that was hiding these bits from userspace, so remove it. This is technically a userspace-visible behavior change for sigaction, as the unknown bits returned via oldact.sa_flags are no longer set. However, we are free to define the behavior for unknown bits exactly because their behavior is currently undefined, so for now we can define the meaning of each of them to be "clear the bit in oldact.sa_flags unless the bit becomes known in the future". Furthermore, this behavior is consistent with OpenBSD [1], illumos [2] and XNU [3] (FreeBSD [4] and NetBSD [5] fail the syscall if unknown bits are set). So there is some precedent for this behavior in other kernels, and in particular in XNU, which is probably the most popular kernel among those that I looked at, which means that this change is less likely to be a compatibility issue. Link: [1] https://github.com/openbsd/src/blob/f634a6a4b5bf832e9c1de77f7894ae2625e74484/sys/kern/kern_sig.c#L278 Link: [2] https://github.com/illumos/illumos-gate/blob/76f19f5fdc974fe5be5c82a556e43a4df93f1de1/usr/src/uts/common/syscall/sigaction.c#L86 Link: [3] https://github.com/apple/darwin-xnu/blob/a449c6a3b8014d9406c2ddbdc81795da24aa7443/bsd/kern/kern_sig.c#L480 Link: [4] https://github.com/freebsd/freebsd/blob/eded70c37057857c6e23fae51f86b8f8f43cd2d0/sys/kern/kern_sig.c#L699 Link: [5] https://github.com/NetBSD/src/blob/3365779becdcedfca206091a645a0e8e22b2946e/sys/kern/sys_sig.c#L473 Signed-off-by: Peter Collingbourne <pcc@google.com> Link: https://linux-review.googlesource.com/id/I35aab6f5be932505d90f3b3450c083b4db1eca86 --- v10: - rename SA_UAPI_FLAGS -> UAPI_SA_FLAGS - refactor how we define it to avoid mentioning flags more than once arch/arm/include/asm/signal.h | 2 ++ arch/parisc/include/asm/signal.h | 2 ++ arch/x86/kernel/signal_compat.c | 7 ------- include/linux/signal_types.h | 12 ++++++++++++ kernel/signal.c | 10 ++++++++++ 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h index 65530a042009..430be7774402 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h @@ -17,6 +17,8 @@ typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; +#define __ARCH_UAPI_SA_FLAGS (SA_THIRTYTWO | SA_RESTORER) + #define __ARCH_HAS_SA_RESTORER #include <asm/sigcontext.h> diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h index 715c96ba2ec8..30dd1e43ef88 100644 --- a/arch/parisc/include/asm/signal.h +++ b/arch/parisc/include/asm/signal.h @@ -21,6 +21,8 @@ typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; +#define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT + #include <asm/sigcontext.h> #endif /* !__ASSEMBLY */ diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index a7f3e12cfbdb..ddfd919be46c 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -165,16 +165,9 @@ void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact) { signal_compat_build_tests(); - /* Don't leak in-kernel non-uapi flags to user-space */ - if (oact) - oact->sa.sa_flags &= ~(SA_IA32_ABI | SA_X32_ABI); - if (!act) return; - /* Don't let flags to be set from userspace */ - act->sa.sa_flags &= ~(SA_IA32_ABI | SA_X32_ABI); - if (in_ia32_syscall()) act->sa.sa_flags |= SA_IA32_ABI; if (in_x32_syscall()) diff --git a/include/linux/signal_types.h b/include/linux/signal_types.h index f8a90ae9c6ec..a7887ad84d36 100644 --- a/include/linux/signal_types.h +++ b/include/linux/signal_types.h @@ -68,4 +68,16 @@ struct ksignal { int sig; }; +#ifndef __ARCH_UAPI_SA_FLAGS +#ifdef SA_RESTORER +#define __ARCH_UAPI_SA_FLAGS SA_RESTORER +#else +#define __ARCH_UAPI_SA_FLAGS 0 +#endif +#endif + +#define UAPI_SA_FLAGS \ + (SA_NOCLDSTOP | SA_NOCLDWAIT | SA_SIGINFO | SA_ONSTACK | SA_RESTART | \ + SA_NODEFER | SA_RESETHAND | __ARCH_UAPI_SA_FLAGS) + #endif /* _LINUX_SIGNAL_TYPES_H */ diff --git a/kernel/signal.c b/kernel/signal.c index a38b3edc6851..2ef8c238679e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3984,6 +3984,16 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) if (oact) *oact = *k; + /* + * Clear unknown flag bits in order to allow userspace to detect missing + * support for flag bits and to allow the kernel to use non-uapi bits + * internally. + */ + if (act) + act->sa.sa_flags &= UAPI_SA_FLAGS; + if (oact) + oact->sa.sa_flags &= UAPI_SA_FLAGS; + sigaction_compat_abi(act, oact); if (act) { -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v12 4/8] signal: clear non-uapi flag bits when passing/returning sa_flags 2020-10-17 0:12 ` [PATCH v12 4/8] signal: clear non-uapi flag bits when passing/returning sa_flags Peter Collingbourne @ 2020-11-02 17:26 ` Dave Martin 0 siblings, 0 replies; 17+ messages in thread From: Dave Martin @ 2020-11-02 17:26 UTC (permalink / raw) To: Peter Collingbourne Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, linux-api, David Spickett, Linux ARM, Richard Henderson On Fri, Oct 16, 2020 at 05:12:29PM -0700, Peter Collingbourne wrote: > Previously we were not clearing non-uapi flag bits in > sigaction.sa_flags when storing the userspace-provided sa_flags or > when returning them via oldact. Start doing so. > > This allows userspace to detect missing support for flag bits and > allows the kernel to use non-uapi bits internally, as we are already > doing in arch/x86 for two flag bits. Now that this change is in > place, we no longer need the code in arch/x86 that was hiding these > bits from userspace, so remove it. > > This is technically a userspace-visible behavior change for sigaction, as > the unknown bits returned via oldact.sa_flags are no longer set. However, > we are free to define the behavior for unknown bits exactly because > their behavior is currently undefined, so for now we can define the > meaning of each of them to be "clear the bit in oldact.sa_flags unless > the bit becomes known in the future". Furthermore, this behavior is > consistent with OpenBSD [1], illumos [2] and XNU [3] (FreeBSD [4] and > NetBSD [5] fail the syscall if unknown bits are set). So there is some > precedent for this behavior in other kernels, and in particular in XNU, > which is probably the most popular kernel among those that I looked at, > which means that this change is less likely to be a compatibility issue. > > Link: [1] https://github.com/openbsd/src/blob/f634a6a4b5bf832e9c1de77f7894ae2625e74484/sys/kern/kern_sig.c#L278 > Link: [2] https://github.com/illumos/illumos-gate/blob/76f19f5fdc974fe5be5c82a556e43a4df93f1de1/usr/src/uts/common/syscall/sigaction.c#L86 > Link: [3] https://github.com/apple/darwin-xnu/blob/a449c6a3b8014d9406c2ddbdc81795da24aa7443/bsd/kern/kern_sig.c#L480 > Link: [4] https://github.com/freebsd/freebsd/blob/eded70c37057857c6e23fae51f86b8f8f43cd2d0/sys/kern/kern_sig.c#L699 > Link: [5] https://github.com/NetBSD/src/blob/3365779becdcedfca206091a645a0e8e22b2946e/sys/kern/sys_sig.c#L473 > Signed-off-by: Peter Collingbourne <pcc@google.com> > Link: https://linux-review.googlesource.com/id/I35aab6f5be932505d90f3b3450c083b4db1eca86 Reviewed-by: Dave Martin <Dave.Martin@arm.com> > --- > v10: > - rename SA_UAPI_FLAGS -> UAPI_SA_FLAGS > - refactor how we define it to avoid mentioning flags more > than once > > arch/arm/include/asm/signal.h | 2 ++ > arch/parisc/include/asm/signal.h | 2 ++ > arch/x86/kernel/signal_compat.c | 7 ------- > include/linux/signal_types.h | 12 ++++++++++++ > kernel/signal.c | 10 ++++++++++ > 5 files changed, 26 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h > index 65530a042009..430be7774402 100644 > --- a/arch/arm/include/asm/signal.h > +++ b/arch/arm/include/asm/signal.h > @@ -17,6 +17,8 @@ typedef struct { > unsigned long sig[_NSIG_WORDS]; > } sigset_t; > > +#define __ARCH_UAPI_SA_FLAGS (SA_THIRTYTWO | SA_RESTORER) > + > #define __ARCH_HAS_SA_RESTORER > > #include <asm/sigcontext.h> > diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h > index 715c96ba2ec8..30dd1e43ef88 100644 > --- a/arch/parisc/include/asm/signal.h > +++ b/arch/parisc/include/asm/signal.h > @@ -21,6 +21,8 @@ typedef struct { > unsigned long sig[_NSIG_WORDS]; > } sigset_t; > > +#define __ARCH_UAPI_SA_FLAGS _SA_SIGGFAULT > + > #include <asm/sigcontext.h> > > #endif /* !__ASSEMBLY */ > diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c > index a7f3e12cfbdb..ddfd919be46c 100644 > --- a/arch/x86/kernel/signal_compat.c > +++ b/arch/x86/kernel/signal_compat.c > @@ -165,16 +165,9 @@ void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact) > { > signal_compat_build_tests(); > > - /* Don't leak in-kernel non-uapi flags to user-space */ > - if (oact) > - oact->sa.sa_flags &= ~(SA_IA32_ABI | SA_X32_ABI); > - > if (!act) > return; > > - /* Don't let flags to be set from userspace */ > - act->sa.sa_flags &= ~(SA_IA32_ABI | SA_X32_ABI); > - > if (in_ia32_syscall()) > act->sa.sa_flags |= SA_IA32_ABI; > if (in_x32_syscall()) > diff --git a/include/linux/signal_types.h b/include/linux/signal_types.h > index f8a90ae9c6ec..a7887ad84d36 100644 > --- a/include/linux/signal_types.h > +++ b/include/linux/signal_types.h > @@ -68,4 +68,16 @@ struct ksignal { > int sig; > }; > > +#ifndef __ARCH_UAPI_SA_FLAGS > +#ifdef SA_RESTORER > +#define __ARCH_UAPI_SA_FLAGS SA_RESTORER > +#else > +#define __ARCH_UAPI_SA_FLAGS 0 > +#endif > +#endif > + > +#define UAPI_SA_FLAGS \ > + (SA_NOCLDSTOP | SA_NOCLDWAIT | SA_SIGINFO | SA_ONSTACK | SA_RESTART | \ > + SA_NODEFER | SA_RESETHAND | __ARCH_UAPI_SA_FLAGS) > + > #endif /* _LINUX_SIGNAL_TYPES_H */ > diff --git a/kernel/signal.c b/kernel/signal.c > index a38b3edc6851..2ef8c238679e 100644 > --- a/kernel/signal.c > +++ b/kernel/signal.c > @@ -3984,6 +3984,16 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) > if (oact) > *oact = *k; > > + /* > + * Clear unknown flag bits in order to allow userspace to detect missing > + * support for flag bits and to allow the kernel to use non-uapi bits > + * internally. > + */ > + if (act) > + act->sa.sa_flags &= UAPI_SA_FLAGS; > + if (oact) > + oact->sa.sa_flags &= UAPI_SA_FLAGS; > + > sigaction_compat_abi(act, oact); > > if (act) { > -- > 2.29.0.rc1.297.gfa9743e501-goog > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v12 5/8] signal: define the SA_UNSUPPORTED bit in sa_flags 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne ` (3 preceding siblings ...) 2020-10-17 0:12 ` [PATCH v12 4/8] signal: clear non-uapi flag bits when passing/returning sa_flags Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 6/8] signal: deduplicate code dealing with common _sigfault fields Peter Collingbourne ` (2 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett Define a sa_flags bit, SA_UNSUPPORTED, which will never be supported in the uapi. The purpose of this flag bit is to allow userspace to distinguish an old kernel that does not clear unknown sa_flags bits from a kernel that supports every flag bit. In other words, if userspace does something like: act.sa_flags |= SA_UNSUPPORTED; sigaction(SIGSEGV, &act, 0); sigaction(SIGSEGV, 0, &oldact); and finds that SA_UNSUPPORTED remains set in oldact.sa_flags, it means that the kernel cannot be trusted to have cleared unknown flag bits from sa_flags, so no assumptions about flag bit support can be made. Signed-off-by: Peter Collingbourne <pcc@google.com> Reviewed-by: Dave Martin <Dave.Martin@arm.com> Link: https://linux-review.googlesource.com/id/Ic2501ad150a3a79c1cf27fb8c99be342e9dffbcb --- v11: - clarify the commit message include/uapi/asm-generic/signal-defs.h | 7 +++++++ kernel/signal.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h index 493953fe319b..0126ebda4d31 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -14,6 +14,12 @@ * SA_RESTART flag to get restarting signals (which were the default long ago) * SA_NODEFER prevents the current signal from being masked in the handler. * SA_RESETHAND clears the handler when the signal is delivered. + * SA_UNSUPPORTED is a flag bit that will never be supported. Kernels from + * before the introduction of SA_UNSUPPORTED did not clear unknown bits from + * sa_flags when read using the oldact argument to sigaction and rt_sigaction, + * so this bit allows flag bit support to be detected from userspace while + * allowing an old kernel to be distinguished from a kernel that supports every + * flag bit. * * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single * Unix names RESETHAND and NODEFER respectively. @@ -42,6 +48,7 @@ #ifndef SA_RESETHAND #define SA_RESETHAND 0x80000000 #endif +#define SA_UNSUPPORTED 0x00000400 #define SA_NOMASK SA_NODEFER #define SA_ONESHOT SA_RESETHAND diff --git a/kernel/signal.c b/kernel/signal.c index 2ef8c238679e..018c19f6cf66 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3984,6 +3984,12 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) if (oact) *oact = *k; + /* + * Make sure that we never accidentally claim to support SA_UNSUPPORTED, + * e.g. by having an architecture use the bit in their uapi. + */ + BUILD_BUG_ON(UAPI_SA_FLAGS & SA_UNSUPPORTED); + /* * Clear unknown flag bits in order to allow userspace to detect missing * support for flag bits and to allow the kernel to use non-uapi bits -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v12 6/8] signal: deduplicate code dealing with common _sigfault fields 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne ` (4 preceding siblings ...) 2020-10-17 0:12 ` [PATCH v12 5/8] signal: define the SA_UNSUPPORTED bit in sa_flags Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 7/8] signal: define the field siginfo.si_xflags Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne 7 siblings, 0 replies; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett We're about to add more common _sigfault fields, so deduplicate the existing code for initializing _sigfault fields in {send,force}_sig_*, and for copying _sigfault fields in copy_siginfo_to_external32 and post_copy_siginfo_from_user32, to reduce the number of places that will need to be updated by upcoming changes. Signed-off-by: Peter Collingbourne <pcc@google.com> Link: https://linux-review.googlesource.com/id/I4f56174e1b7b2bf4a3c8139e6879cbfd52750a24 --- include/linux/signal.h | 13 ++++++ kernel/signal.c | 101 ++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 61 deletions(-) diff --git a/include/linux/signal.h b/include/linux/signal.h index 7bbc0e9cf084..9b7fef0c559d 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -50,6 +50,19 @@ enum siginfo_layout { enum siginfo_layout siginfo_layout(unsigned sig, int si_code); +static inline bool siginfo_layout_is_fault(enum siginfo_layout layout) +{ + switch (layout) { + case SIL_FAULT: + case SIL_FAULT_MCEERR: + case SIL_FAULT_BNDERR: + case SIL_FAULT_PKUERR: + return true; + default: + return false; + } +} + /* * Define some primitives to manipulate sigset_t. */ diff --git a/kernel/signal.c b/kernel/signal.c index 018c19f6cf66..acdfd5a6d424 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1649,6 +1649,15 @@ void force_sigsegv(int sig) force_sig(SIGSEGV); } +static void set_sigfault_common_fields(struct kernel_siginfo *info, int sig, + int code, void __user *addr) +{ + info->si_signo = sig; + info->si_errno = 0; + info->si_code = code; + info->si_addr = addr; +} + int force_sig_fault_to_task(int sig, int code, void __user *addr ___ARCH_SI_TRAPNO(int trapno) ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr) @@ -1657,10 +1666,7 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr struct kernel_siginfo info; clear_siginfo(&info); - info.si_signo = sig; - info.si_errno = 0; - info.si_code = code; - info.si_addr = addr; + set_sigfault_common_fields(&info, sig, code, addr); #ifdef __ARCH_SI_TRAPNO info.si_trapno = trapno; #endif @@ -1689,10 +1695,7 @@ int send_sig_fault(int sig, int code, void __user *addr struct kernel_siginfo info; clear_siginfo(&info); - info.si_signo = sig; - info.si_errno = 0; - info.si_code = code; - info.si_addr = addr; + set_sigfault_common_fields(&info, sig, code, addr); #ifdef __ARCH_SI_TRAPNO info.si_trapno = trapno; #endif @@ -1710,10 +1713,7 @@ int force_sig_mceerr(int code, void __user *addr, short lsb) WARN_ON((code != BUS_MCEERR_AO) && (code != BUS_MCEERR_AR)); clear_siginfo(&info); - info.si_signo = SIGBUS; - info.si_errno = 0; - info.si_code = code; - info.si_addr = addr; + set_sigfault_common_fields(&info, SIGBUS, code, addr); info.si_addr_lsb = lsb; return force_sig_info(&info); } @@ -1724,10 +1724,7 @@ int send_sig_mceerr(int code, void __user *addr, short lsb, struct task_struct * WARN_ON((code != BUS_MCEERR_AO) && (code != BUS_MCEERR_AR)); clear_siginfo(&info); - info.si_signo = SIGBUS; - info.si_errno = 0; - info.si_code = code; - info.si_addr = addr; + set_sigfault_common_fields(&info, SIGBUS, code, addr); info.si_addr_lsb = lsb; return send_sig_info(info.si_signo, &info, t); } @@ -1738,10 +1735,7 @@ int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper) struct kernel_siginfo info; clear_siginfo(&info); - info.si_signo = SIGSEGV; - info.si_errno = 0; - info.si_code = SEGV_BNDERR; - info.si_addr = addr; + set_sigfault_common_fields(&info, SIGSEGV, SEGV_BNDERR, addr); info.si_lower = lower; info.si_upper = upper; return force_sig_info(&info); @@ -1753,10 +1747,7 @@ int force_sig_pkuerr(void __user *addr, u32 pkey) struct kernel_siginfo info; clear_siginfo(&info); - info.si_signo = SIGSEGV; - info.si_errno = 0; - info.si_code = SEGV_PKUERR; - info.si_addr = addr; + set_sigfault_common_fields(&info, SIGSEGV, SEGV_PKUERR, addr); info.si_pkey = pkey; return force_sig_info(&info); } @@ -1770,10 +1761,8 @@ int force_sig_ptrace_errno_trap(int errno, void __user *addr) struct kernel_siginfo info; clear_siginfo(&info); - info.si_signo = SIGTRAP; + set_sigfault_common_fields(&info, SIGTRAP, TRAP_HWBKPT, addr); info.si_errno = errno; - info.si_code = TRAP_HWBKPT; - info.si_addr = addr; return force_sig_info(&info); } @@ -3266,12 +3255,23 @@ int copy_siginfo_from_user(kernel_siginfo_t *to, const siginfo_t __user *from) void copy_siginfo_to_external32(struct compat_siginfo *to, const struct kernel_siginfo *from) { + enum siginfo_layout layout = + siginfo_layout(from->si_signo, from->si_code); + memset(to, 0, sizeof(*to)); to->si_signo = from->si_signo; to->si_errno = from->si_errno; to->si_code = from->si_code; - switch(siginfo_layout(from->si_signo, from->si_code)) { + + if (siginfo_layout_is_fault(layout)) { + to->si_addr = ptr_to_compat(from->si_addr); +#ifdef __ARCH_SI_TRAPNO + to->si_trapno = from->si_trapno; +#endif + } + + switch (layout) { case SIL_KILL: to->si_pid = from->si_pid; to->si_uid = from->si_uid; @@ -3286,31 +3286,15 @@ void copy_siginfo_to_external32(struct compat_siginfo *to, to->si_fd = from->si_fd; break; case SIL_FAULT: - to->si_addr = ptr_to_compat(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif break; case SIL_FAULT_MCEERR: - to->si_addr = ptr_to_compat(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif to->si_addr_lsb = from->si_addr_lsb; break; case SIL_FAULT_BNDERR: - to->si_addr = ptr_to_compat(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif to->si_lower = ptr_to_compat(from->si_lower); to->si_upper = ptr_to_compat(from->si_upper); break; case SIL_FAULT_PKUERR: - to->si_addr = ptr_to_compat(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif to->si_pkey = from->si_pkey; break; case SIL_CHLD: @@ -3347,11 +3331,22 @@ int __copy_siginfo_to_user32(struct compat_siginfo __user *to, static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, const struct compat_siginfo *from) { + enum siginfo_layout layout = + siginfo_layout(from->si_signo, from->si_code); + clear_siginfo(to); to->si_signo = from->si_signo; to->si_errno = from->si_errno; to->si_code = from->si_code; - switch(siginfo_layout(from->si_signo, from->si_code)) { + + if (siginfo_layout_is_fault(layout)) { + to->si_addr = compat_ptr(from->si_addr); +#ifdef __ARCH_SI_TRAPNO + to->si_trapno = from->si_trapno; +#endif + } + + switch (layout) { case SIL_KILL: to->si_pid = from->si_pid; to->si_uid = from->si_uid; @@ -3366,31 +3361,15 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, to->si_fd = from->si_fd; break; case SIL_FAULT: - to->si_addr = compat_ptr(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif break; case SIL_FAULT_MCEERR: - to->si_addr = compat_ptr(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif to->si_addr_lsb = from->si_addr_lsb; break; case SIL_FAULT_BNDERR: - to->si_addr = compat_ptr(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif to->si_lower = compat_ptr(from->si_lower); to->si_upper = compat_ptr(from->si_upper); break; case SIL_FAULT_PKUERR: - to->si_addr = compat_ptr(from->si_addr); -#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from->si_trapno; -#endif to->si_pkey = from->si_pkey; break; case SIL_CHLD: -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v12 7/8] signal: define the field siginfo.si_xflags 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne ` (5 preceding siblings ...) 2020-10-17 0:12 ` [PATCH v12 6/8] signal: deduplicate code dealing with common _sigfault fields Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-11-02 17:37 ` Dave Martin 2020-10-17 0:12 ` [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne 7 siblings, 1 reply; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett This field will contain flags that may be used by signal handlers to determine whether other fields in the _sigfault portion of siginfo are valid. An example use case is the following patch, which introduces the si_addr_tag_bits{,_mask} fields. A new sigcontext flag, SA_XFLAGS, is introduced in order to allow a signal handler to require the kernel to set the field (but note that the field will be set anyway if the kernel supports the flag, regardless of its value). In combination with the previous patches, this allows a userspace program to determine whether the kernel will set the field. It is possible for an si_xflags-unaware program to cause a signal handler in an si_xflags-aware program to be called with a provided siginfo data structure by using one of the following syscalls: - ptrace(PTRACE_SETSIGINFO) - pidfd_send_signal - rt_sigqueueinfo - rt_tgsigqueueinfo So we need to prevent the si_xflags-unaware program from causing an uninitialized read of si_xflags in the si_xflags-aware program when it uses one of these syscalls. The last three cases can be handled by observing that each of these syscalls fails if si_code >= 0. We also observe that kill(2) and tgkill(2) may be used to send a signal where si_code == 0 (SI_USER), so we define si_xflags to only be valid if si_code > 0. There is no such check on si_code in ptrace(PTRACE_SETSIGINFO), so we make ptrace(PTRACE_SETSIGINFO) clear the si_xflags field if it detects that the signal would use the _sigfault layout, and introduce a new ptrace request type, PTRACE_SETSIGINFO2, that a si_xflags-aware program may use to opt out of this behavior. It is also possible for the kernel to inject a signal specified to use _sigfault by calling force_sig (e.g. there are numerous calls to force_sig(SIGSEGV)). In this case si_code is set to SI_KERNEL and the _kill union member is used, so document that si_code must be < SI_KERNEL. Ideally this field could have just been named si_flags, but that name was already taken by ia64, so a different name was chosen. I considered making ia64's si_flags a generic field and having it appear at the end of _sigfault (in the same place as this patch has si_xflags) on non-ia64, keeping it in the same place on ia64. ia64's si_flags is a 32-bit field with only one flag bit allocated, so we would have 31 bits to use if we do this. However, it seems simplest to avoid entangling these fields. Signed-off-by: Peter Collingbourne <pcc@google.com> Link: https://linux-review.googlesource.com/id/Ide155ce29366c3eab2a944ae4c51205982e5b8b2 --- v12: - Change type of si_xflags to u32 to avoid increasing alignment - Add si_xflags to signal_compat.c test cases v11: - update comment to say that si_code must > 0 - change ptrace(PTRACE_SETSIGINFO2) to take a flags argument v10: - make the new field compatible with the various ways that a siginfo can be injected from another process - eliminate some duplication by adding a refactoring patch before this one arch/powerpc/platforms/powernv/vas-fault.c | 1 + arch/x86/kernel/signal_compat.c | 7 +++-- include/linux/compat.h | 2 ++ include/linux/signal_types.h | 2 +- include/uapi/asm-generic/siginfo.h | 4 +++ include/uapi/asm-generic/signal-defs.h | 4 +++ include/uapi/linux/ptrace.h | 12 ++++++++ kernel/ptrace.c | 32 ++++++++++++++++++---- kernel/signal.c | 3 ++ 9 files changed, 58 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c index 3d21fce254b7..3bbb335561f5 100644 --- a/arch/powerpc/platforms/powernv/vas-fault.c +++ b/arch/powerpc/platforms/powernv/vas-fault.c @@ -154,6 +154,7 @@ static void update_csb(struct vas_window *window, info.si_errno = EFAULT; info.si_code = SEGV_MAPERR; info.si_addr = csb_addr; + info.si_xflags = 0; /* * process will be polling on csb.flags after request is sent to diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index ddfd919be46c..243a8cc3b41b 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -121,8 +121,8 @@ static inline void signal_compat_build_tests(void) #endif CHECK_CSI_OFFSET(_sigfault); - CHECK_CSI_SIZE (_sigfault, 4*sizeof(int)); - CHECK_SI_SIZE (_sigfault, 8*sizeof(int)); + CHECK_CSI_SIZE (_sigfault, 8*sizeof(int)); + CHECK_SI_SIZE (_sigfault, 16*sizeof(int)); BUILD_BUG_ON(offsetof(siginfo_t, si_addr) != 0x10); BUILD_BUG_ON(offsetof(compat_siginfo_t, si_addr) != 0x0C); @@ -138,6 +138,9 @@ static inline void signal_compat_build_tests(void) BUILD_BUG_ON(offsetof(siginfo_t, si_pkey) != 0x20); BUILD_BUG_ON(offsetof(compat_siginfo_t, si_pkey) != 0x14); + BUILD_BUG_ON(offsetof(siginfo_t, si_xflags) != 0x48); + BUILD_BUG_ON(offsetof(compat_siginfo_t, si_xflags) != 0x28); + CHECK_CSI_OFFSET(_sigpoll); CHECK_CSI_SIZE (_sigpoll, 2*sizeof(int)); CHECK_SI_SIZE (_sigpoll, 4*sizeof(int)); diff --git a/include/linux/compat.h b/include/linux/compat.h index 14d514233e1d..ea77a24ce6a2 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -236,7 +236,9 @@ typedef struct compat_siginfo { char _dummy_pkey[__COMPAT_ADDR_BND_PKEY_PAD]; u32 _pkey; } _addr_pkey; + compat_uptr_t _pad[6]; }; + u32 _xflags; } _sigfault; /* SIGPOLL */ diff --git a/include/linux/signal_types.h b/include/linux/signal_types.h index a7887ad84d36..75ca861d982a 100644 --- a/include/linux/signal_types.h +++ b/include/linux/signal_types.h @@ -78,6 +78,6 @@ struct ksignal { #define UAPI_SA_FLAGS \ (SA_NOCLDSTOP | SA_NOCLDWAIT | SA_SIGINFO | SA_ONSTACK | SA_RESTART | \ - SA_NODEFER | SA_RESETHAND | __ARCH_UAPI_SA_FLAGS) + SA_NODEFER | SA_RESETHAND | SA_XFLAGS | __ARCH_UAPI_SA_FLAGS) #endif /* _LINUX_SIGNAL_TYPES_H */ diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h index 7aacf9389010..8158d5df666a 100644 --- a/include/uapi/asm-generic/siginfo.h +++ b/include/uapi/asm-generic/siginfo.h @@ -91,7 +91,9 @@ union __sifields { char _dummy_pkey[__ADDR_BND_PKEY_PAD]; __u32 _pkey; } _addr_pkey; + void *_pad[6]; }; + __u32 _xflags; } _sigfault; /* SIGPOLL */ @@ -152,6 +154,8 @@ typedef struct siginfo { #define si_trapno _sifields._sigfault._trapno #endif #define si_addr_lsb _sifields._sigfault._addr_lsb +/* si_xflags is only valid if 0 < si_code < SI_KERNEL */ +#define si_xflags _sifields._sigfault._xflags #define si_lower _sifields._sigfault._addr_bnd._lower #define si_upper _sifields._sigfault._addr_bnd._upper #define si_pkey _sifields._sigfault._addr_pkey._pkey diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h index 0126ebda4d31..cd522819f4ba 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -20,6 +20,9 @@ * so this bit allows flag bit support to be detected from userspace while * allowing an old kernel to be distinguished from a kernel that supports every * flag bit. + * SA_XFLAGS indicates that the signal handler requires the siginfo.si_xflags + * field to be valid. Note that if the kernel supports SA_XFLAGS, the field will + * be valid regardless of the value of this flag. * * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single * Unix names RESETHAND and NODEFER respectively. @@ -49,6 +52,7 @@ #define SA_RESETHAND 0x80000000 #endif #define SA_UNSUPPORTED 0x00000400 +#define SA_XFLAGS 0x00000800 #define SA_NOMASK SA_NODEFER #define SA_ONESHOT SA_RESETHAND diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h index a71b6e3b03eb..93946edf0139 100644 --- a/include/uapi/linux/ptrace.h +++ b/include/uapi/linux/ptrace.h @@ -101,6 +101,18 @@ struct ptrace_syscall_info { }; }; +#define PTRACE_SETSIGINFO2 0x420f +/* + * These flags are passed as the addr argument to ptrace. + */ + +/* + * Asserts that the caller is aware of the field siginfo.si_xflags. Prevents + * the kernel from automatically setting the field to 0 when the signal uses + * a sigfault layout. + */ +#define PTRACE_SIGINFO_XFLAGS 0x1 + /* * These values are stored in task->ptrace_message * by tracehook_report_syscall_* to describe the current syscall-stop. diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 43d6179508d6..85b5b4e38661 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -687,18 +687,32 @@ static int ptrace_getsiginfo(struct task_struct *child, kernel_siginfo_t *info) return error; } -static int ptrace_setsiginfo(struct task_struct *child, const kernel_siginfo_t *info) +static int ptrace_setsiginfo(struct task_struct *child, unsigned long flags, + kernel_siginfo_t *info) { - unsigned long flags; + unsigned long lock_flags; int error = -ESRCH; - if (lock_task_sighand(child, &flags)) { + if (flags & ~PTRACE_SIGINFO_XFLAGS) { + return -EINVAL; + } + + /* + * If the caller is unaware of si_xflags and we're using a layout that + * requires it, set it to 0 which means "no fields are available". + */ + if (!(flags & PTRACE_SIGINFO_XFLAGS) && + siginfo_layout_is_fault( + siginfo_layout(info->si_signo, info->si_code))) + info->si_xflags = 0; + + if (lock_task_sighand(child, &lock_flags)) { error = -EINVAL; if (likely(child->last_siginfo != NULL)) { copy_siginfo(child->last_siginfo, info); error = 0; } - unlock_task_sighand(child, &flags); + unlock_task_sighand(child, &lock_flags); } return error; } @@ -1038,9 +1052,12 @@ int ptrace_request(struct task_struct *child, long request, break; case PTRACE_SETSIGINFO: + addr = 0; + + case PTRACE_SETSIGINFO2: ret = copy_siginfo_from_user(&siginfo, datavp); if (!ret) - ret = ptrace_setsiginfo(child, &siginfo); + ret = ptrace_setsiginfo(child, addr, &siginfo); break; case PTRACE_GETSIGMASK: { @@ -1347,10 +1364,13 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, break; case PTRACE_SETSIGINFO: + addr = 0; + + case PTRACE_SETSIGINFO2: ret = copy_siginfo_from_user32( &siginfo, (struct compat_siginfo __user *) datap); if (!ret) - ret = ptrace_setsiginfo(child, &siginfo); + ret = ptrace_setsiginfo(child, addr, &siginfo); break; #ifdef CONFIG_HAVE_ARCH_TRACEHOOK case PTRACE_GETREGSET: diff --git a/kernel/signal.c b/kernel/signal.c index acdfd5a6d424..5c715a01942f 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1656,6 +1656,7 @@ static void set_sigfault_common_fields(struct kernel_siginfo *info, int sig, info->si_errno = 0; info->si_code = code; info->si_addr = addr; + info->si_xflags = 0; } int force_sig_fault_to_task(int sig, int code, void __user *addr @@ -3269,6 +3270,7 @@ void copy_siginfo_to_external32(struct compat_siginfo *to, #ifdef __ARCH_SI_TRAPNO to->si_trapno = from->si_trapno; #endif + to->si_xflags = from->si_xflags; } switch (layout) { @@ -3344,6 +3346,7 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, #ifdef __ARCH_SI_TRAPNO to->si_trapno = from->si_trapno; #endif + to->si_xflags = from->si_xflags; } switch (layout) { -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v12 7/8] signal: define the field siginfo.si_xflags 2020-10-17 0:12 ` [PATCH v12 7/8] signal: define the field siginfo.si_xflags Peter Collingbourne @ 2020-11-02 17:37 ` Dave Martin 2020-11-03 4:10 ` Peter Collingbourne 0 siblings, 1 reply; 17+ messages in thread From: Dave Martin @ 2020-11-02 17:37 UTC (permalink / raw) To: Peter Collingbourne Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, linux-api, David Spickett, Linux ARM, Richard Henderson On Fri, Oct 16, 2020 at 05:12:32PM -0700, Peter Collingbourne wrote: > This field will contain flags that may be used by signal handlers to > determine whether other fields in the _sigfault portion of siginfo are > valid. An example use case is the following patch, which introduces > the si_addr_tag_bits{,_mask} fields. > > A new sigcontext flag, SA_XFLAGS, is introduced in order to allow > a signal handler to require the kernel to set the field (but note > that the field will be set anyway if the kernel supports the flag, > regardless of its value). In combination with the previous patches, > this allows a userspace program to determine whether the kernel will > set the field. Apologies for this coming rather late: It occurs to me that we might want a more specific name, since this only applies to fault signals -- say, SA_FAULTFLAGS. If we end up wanting to add flags fields for other signal types, then we might end up needing a SA_ flag for each, which would be a bit annoying. So, alternatively. I wonder whether it's worth preemptively adding an extra flags to every kind of kernel-generated siginfo. If so, then having a single SA_XFLAGS would be fine. If added flags fields all over the place is considered overkill, then I guess it's sufficient to rename this flag. If renaming, the actual flags field in siginfo should also be renamed to match. > > It is possible for an si_xflags-unaware program to cause a signal > handler in an si_xflags-aware program to be called with a provided > siginfo data structure by using one of the following syscalls: > > - ptrace(PTRACE_SETSIGINFO) > - pidfd_send_signal > - rt_sigqueueinfo > - rt_tgsigqueueinfo > > So we need to prevent the si_xflags-unaware program from causing an > uninitialized read of si_xflags in the si_xflags-aware program when > it uses one of these syscalls. > > The last three cases can be handled by observing that each of these > syscalls fails if si_code >= 0. We also observe that kill(2) and > tgkill(2) may be used to send a signal where si_code == 0 (SI_USER), > so we define si_xflags to only be valid if si_code > 0. > > There is no such check on si_code in ptrace(PTRACE_SETSIGINFO), so > we make ptrace(PTRACE_SETSIGINFO) clear the si_xflags field if it > detects that the signal would use the _sigfault layout, and introduce > a new ptrace request type, PTRACE_SETSIGINFO2, that a si_xflags-aware > program may use to opt out of this behavior. > > It is also possible for the kernel to inject a signal specified to > use _sigfault by calling force_sig (e.g. there are numerous calls to > force_sig(SIGSEGV)). In this case si_code is set to SI_KERNEL and the > _kill union member is used, so document that si_code must be < SI_KERNEL. > > Ideally this field could have just been named si_flags, but that > name was already taken by ia64, so a different name was chosen. > > I considered making ia64's si_flags a generic field and having it > appear at the end of _sigfault (in the same place as this patch has > si_xflags) on non-ia64, keeping it in the same place on ia64. ia64's > si_flags is a 32-bit field with only one flag bit allocated, so we > would have 31 bits to use if we do this. However, it seems simplest > to avoid entangling these fields. > > Signed-off-by: Peter Collingbourne <pcc@google.com> > Link: https://linux-review.googlesource.com/id/Ide155ce29366c3eab2a944ae4c51205982e5b8b2 > --- > v12: > - Change type of si_xflags to u32 to avoid increasing alignment > - Add si_xflags to signal_compat.c test cases > > v11: > - update comment to say that si_code must > 0 > - change ptrace(PTRACE_SETSIGINFO2) to take a flags argument > > v10: > - make the new field compatible with the various ways > that a siginfo can be injected from another process > - eliminate some duplication by adding a refactoring patch > before this one > > arch/powerpc/platforms/powernv/vas-fault.c | 1 + > arch/x86/kernel/signal_compat.c | 7 +++-- > include/linux/compat.h | 2 ++ > include/linux/signal_types.h | 2 +- > include/uapi/asm-generic/siginfo.h | 4 +++ > include/uapi/asm-generic/signal-defs.h | 4 +++ > include/uapi/linux/ptrace.h | 12 ++++++++ > kernel/ptrace.c | 32 ++++++++++++++++++---- > kernel/signal.c | 3 ++ > 9 files changed, 58 insertions(+), 9 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c > index 3d21fce254b7..3bbb335561f5 100644 > --- a/arch/powerpc/platforms/powernv/vas-fault.c > +++ b/arch/powerpc/platforms/powernv/vas-fault.c > @@ -154,6 +154,7 @@ static void update_csb(struct vas_window *window, > info.si_errno = EFAULT; > info.si_code = SEGV_MAPERR; > info.si_addr = csb_addr; > + info.si_xflags = 0; > > /* > * process will be polling on csb.flags after request is sent to > diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c > index ddfd919be46c..243a8cc3b41b 100644 > --- a/arch/x86/kernel/signal_compat.c > +++ b/arch/x86/kernel/signal_compat.c > @@ -121,8 +121,8 @@ static inline void signal_compat_build_tests(void) > #endif > > CHECK_CSI_OFFSET(_sigfault); > - CHECK_CSI_SIZE (_sigfault, 4*sizeof(int)); > - CHECK_SI_SIZE (_sigfault, 8*sizeof(int)); > + CHECK_CSI_SIZE (_sigfault, 8*sizeof(int)); > + CHECK_SI_SIZE (_sigfault, 16*sizeof(int)); > > BUILD_BUG_ON(offsetof(siginfo_t, si_addr) != 0x10); > BUILD_BUG_ON(offsetof(compat_siginfo_t, si_addr) != 0x0C); > @@ -138,6 +138,9 @@ static inline void signal_compat_build_tests(void) > BUILD_BUG_ON(offsetof(siginfo_t, si_pkey) != 0x20); > BUILD_BUG_ON(offsetof(compat_siginfo_t, si_pkey) != 0x14); > > + BUILD_BUG_ON(offsetof(siginfo_t, si_xflags) != 0x48); > + BUILD_BUG_ON(offsetof(compat_siginfo_t, si_xflags) != 0x28); > + > CHECK_CSI_OFFSET(_sigpoll); > CHECK_CSI_SIZE (_sigpoll, 2*sizeof(int)); > CHECK_SI_SIZE (_sigpoll, 4*sizeof(int)); > diff --git a/include/linux/compat.h b/include/linux/compat.h > index 14d514233e1d..ea77a24ce6a2 100644 > --- a/include/linux/compat.h > +++ b/include/linux/compat.h > @@ -236,7 +236,9 @@ typedef struct compat_siginfo { > char _dummy_pkey[__COMPAT_ADDR_BND_PKEY_PAD]; > u32 _pkey; > } _addr_pkey; > + compat_uptr_t _pad[6]; > }; > + u32 _xflags; > } _sigfault; > > /* SIGPOLL */ > diff --git a/include/linux/signal_types.h b/include/linux/signal_types.h > index a7887ad84d36..75ca861d982a 100644 > --- a/include/linux/signal_types.h > +++ b/include/linux/signal_types.h > @@ -78,6 +78,6 @@ struct ksignal { > > #define UAPI_SA_FLAGS \ > (SA_NOCLDSTOP | SA_NOCLDWAIT | SA_SIGINFO | SA_ONSTACK | SA_RESTART | \ > - SA_NODEFER | SA_RESETHAND | __ARCH_UAPI_SA_FLAGS) > + SA_NODEFER | SA_RESETHAND | SA_XFLAGS | __ARCH_UAPI_SA_FLAGS) > > #endif /* _LINUX_SIGNAL_TYPES_H */ > diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h > index 7aacf9389010..8158d5df666a 100644 > --- a/include/uapi/asm-generic/siginfo.h > +++ b/include/uapi/asm-generic/siginfo.h > @@ -91,7 +91,9 @@ union __sifields { > char _dummy_pkey[__ADDR_BND_PKEY_PAD]; > __u32 _pkey; > } _addr_pkey; > + void *_pad[6]; > }; > + __u32 _xflags; > } _sigfault; > > /* SIGPOLL */ > @@ -152,6 +154,8 @@ typedef struct siginfo { > #define si_trapno _sifields._sigfault._trapno > #endif > #define si_addr_lsb _sifields._sigfault._addr_lsb > +/* si_xflags is only valid if 0 < si_code < SI_KERNEL */ > +#define si_xflags _sifields._sigfault._xflags > #define si_lower _sifields._sigfault._addr_bnd._lower > #define si_upper _sifields._sigfault._addr_bnd._upper > #define si_pkey _sifields._sigfault._addr_pkey._pkey > diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h > index 0126ebda4d31..cd522819f4ba 100644 > --- a/include/uapi/asm-generic/signal-defs.h > +++ b/include/uapi/asm-generic/signal-defs.h > @@ -20,6 +20,9 @@ > * so this bit allows flag bit support to be detected from userspace while > * allowing an old kernel to be distinguished from a kernel that supports every > * flag bit. > + * SA_XFLAGS indicates that the signal handler requires the siginfo.si_xflags > + * field to be valid. Note that if the kernel supports SA_XFLAGS, the field will > + * be valid regardless of the value of this flag. > * > * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > * Unix names RESETHAND and NODEFER respectively. > @@ -49,6 +52,7 @@ > #define SA_RESETHAND 0x80000000 > #endif > #define SA_UNSUPPORTED 0x00000400 > +#define SA_XFLAGS 0x00000800 > > #define SA_NOMASK SA_NODEFER > #define SA_ONESHOT SA_RESETHAND > diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h > index a71b6e3b03eb..93946edf0139 100644 > --- a/include/uapi/linux/ptrace.h > +++ b/include/uapi/linux/ptrace.h > @@ -101,6 +101,18 @@ struct ptrace_syscall_info { > }; > }; > > +#define PTRACE_SETSIGINFO2 0x420f > +/* > + * These flags are passed as the addr argument to ptrace. > + */ > + > +/* > + * Asserts that the caller is aware of the field siginfo.si_xflags. Prevents > + * the kernel from automatically setting the field to 0 when the signal uses > + * a sigfault layout. > + */ > +#define PTRACE_SIGINFO_XFLAGS 0x1 > + > /* > * These values are stored in task->ptrace_message > * by tracehook_report_syscall_* to describe the current syscall-stop. > diff --git a/kernel/ptrace.c b/kernel/ptrace.c > index 43d6179508d6..85b5b4e38661 100644 > --- a/kernel/ptrace.c > +++ b/kernel/ptrace.c > @@ -687,18 +687,32 @@ static int ptrace_getsiginfo(struct task_struct *child, kernel_siginfo_t *info) > return error; > } > > -static int ptrace_setsiginfo(struct task_struct *child, const kernel_siginfo_t *info) > +static int ptrace_setsiginfo(struct task_struct *child, unsigned long flags, > + kernel_siginfo_t *info) > { > - unsigned long flags; > + unsigned long lock_flags; > int error = -ESRCH; > > - if (lock_task_sighand(child, &flags)) { > + if (flags & ~PTRACE_SIGINFO_XFLAGS) { > + return -EINVAL; > + } > + > + /* > + * If the caller is unaware of si_xflags and we're using a layout that > + * requires it, set it to 0 which means "no fields are available". > + */ > + if (!(flags & PTRACE_SIGINFO_XFLAGS) && > + siginfo_layout_is_fault( > + siginfo_layout(info->si_signo, info->si_code))) > + info->si_xflags = 0; > + > + if (lock_task_sighand(child, &lock_flags)) { > error = -EINVAL; > if (likely(child->last_siginfo != NULL)) { > copy_siginfo(child->last_siginfo, info); > error = 0; > } > - unlock_task_sighand(child, &flags); > + unlock_task_sighand(child, &lock_flags); > } > return error; > } > @@ -1038,9 +1052,12 @@ int ptrace_request(struct task_struct *child, long request, > break; > > case PTRACE_SETSIGINFO: > + addr = 0; If this is intended to fall through, please add a /* fall through */ comment here (newer GCC has warnings to catch this; not sure about clang, but I'd be surprised if no version warns). [...] Otherwise, the patch looks reasonable, but I'll wait for your response on the above points before reviewing in detail. Cheers ---Dave ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v12 7/8] signal: define the field siginfo.si_xflags 2020-11-02 17:37 ` Dave Martin @ 2020-11-03 4:10 ` Peter Collingbourne 2020-11-03 11:44 ` Dave Martin 0 siblings, 1 reply; 17+ messages in thread From: Peter Collingbourne @ 2020-11-03 4:10 UTC (permalink / raw) To: Dave Martin Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, Linux API, David Spickett, Linux ARM, Richard Henderson On Mon, Nov 2, 2020 at 9:38 AM Dave Martin <Dave.Martin@arm.com> wrote: > > On Fri, Oct 16, 2020 at 05:12:32PM -0700, Peter Collingbourne wrote: > > This field will contain flags that may be used by signal handlers to > > determine whether other fields in the _sigfault portion of siginfo are > > valid. An example use case is the following patch, which introduces > > the si_addr_tag_bits{,_mask} fields. > > > > A new sigcontext flag, SA_XFLAGS, is introduced in order to allow > > a signal handler to require the kernel to set the field (but note > > that the field will be set anyway if the kernel supports the flag, > > regardless of its value). In combination with the previous patches, > > this allows a userspace program to determine whether the kernel will > > set the field. > > Apologies for this coming rather late: > > It occurs to me that we might want a more specific name, since this only > applies to fault signals -- say, SA_FAULTFLAGS. > > If we end up wanting to add flags fields for other signal types, then we > might end up needing a SA_ flag for each, which would be a bit annoying. > > So, alternatively. I wonder whether it's worth preemptively adding an > extra flags to every kind of kernel-generated siginfo. If so, then > having a single SA_XFLAGS would be fine. > > > If added flags fields all over the place is considered overkill, then I > guess it's sufficient to rename this flag. > > If renaming, the actual flags field in siginfo should also be renamed to > match. I'd prefer not to add flags fields to every union member at this point. I agree that faultflags is a better name, and I guess it's one more reason not to try and reuse the ia64 field. Renamed in v13. > > > > It is possible for an si_xflags-unaware program to cause a signal > > handler in an si_xflags-aware program to be called with a provided > > siginfo data structure by using one of the following syscalls: > > > > - ptrace(PTRACE_SETSIGINFO) > > - pidfd_send_signal > > - rt_sigqueueinfo > > - rt_tgsigqueueinfo > > > > So we need to prevent the si_xflags-unaware program from causing an > > uninitialized read of si_xflags in the si_xflags-aware program when > > it uses one of these syscalls. > > > > The last three cases can be handled by observing that each of these > > syscalls fails if si_code >= 0. We also observe that kill(2) and > > tgkill(2) may be used to send a signal where si_code == 0 (SI_USER), > > so we define si_xflags to only be valid if si_code > 0. > > > > There is no such check on si_code in ptrace(PTRACE_SETSIGINFO), so > > we make ptrace(PTRACE_SETSIGINFO) clear the si_xflags field if it > > detects that the signal would use the _sigfault layout, and introduce > > a new ptrace request type, PTRACE_SETSIGINFO2, that a si_xflags-aware > > program may use to opt out of this behavior. > > > > It is also possible for the kernel to inject a signal specified to > > use _sigfault by calling force_sig (e.g. there are numerous calls to > > force_sig(SIGSEGV)). In this case si_code is set to SI_KERNEL and the > > _kill union member is used, so document that si_code must be < SI_KERNEL. > > > > Ideally this field could have just been named si_flags, but that > > name was already taken by ia64, so a different name was chosen. > > > > I considered making ia64's si_flags a generic field and having it > > appear at the end of _sigfault (in the same place as this patch has > > si_xflags) on non-ia64, keeping it in the same place on ia64. ia64's > > si_flags is a 32-bit field with only one flag bit allocated, so we > > would have 31 bits to use if we do this. However, it seems simplest > > to avoid entangling these fields. > > > > Signed-off-by: Peter Collingbourne <pcc@google.com> > > Link: https://linux-review.googlesource.com/id/Ide155ce29366c3eab2a944ae4c51205982e5b8b2 > > --- > > v12: > > - Change type of si_xflags to u32 to avoid increasing alignment > > - Add si_xflags to signal_compat.c test cases > > > > v11: > > - update comment to say that si_code must > 0 > > - change ptrace(PTRACE_SETSIGINFO2) to take a flags argument > > > > v10: > > - make the new field compatible with the various ways > > that a siginfo can be injected from another process > > - eliminate some duplication by adding a refactoring patch > > before this one > > > > arch/powerpc/platforms/powernv/vas-fault.c | 1 + > > arch/x86/kernel/signal_compat.c | 7 +++-- > > include/linux/compat.h | 2 ++ > > include/linux/signal_types.h | 2 +- > > include/uapi/asm-generic/siginfo.h | 4 +++ > > include/uapi/asm-generic/signal-defs.h | 4 +++ > > include/uapi/linux/ptrace.h | 12 ++++++++ > > kernel/ptrace.c | 32 ++++++++++++++++++---- > > kernel/signal.c | 3 ++ > > 9 files changed, 58 insertions(+), 9 deletions(-) > > > > diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c > > index 3d21fce254b7..3bbb335561f5 100644 > > --- a/arch/powerpc/platforms/powernv/vas-fault.c > > +++ b/arch/powerpc/platforms/powernv/vas-fault.c > > @@ -154,6 +154,7 @@ static void update_csb(struct vas_window *window, > > info.si_errno = EFAULT; > > info.si_code = SEGV_MAPERR; > > info.si_addr = csb_addr; > > + info.si_xflags = 0; > > > > /* > > * process will be polling on csb.flags after request is sent to > > diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c > > index ddfd919be46c..243a8cc3b41b 100644 > > --- a/arch/x86/kernel/signal_compat.c > > +++ b/arch/x86/kernel/signal_compat.c > > @@ -121,8 +121,8 @@ static inline void signal_compat_build_tests(void) > > #endif > > > > CHECK_CSI_OFFSET(_sigfault); > > - CHECK_CSI_SIZE (_sigfault, 4*sizeof(int)); > > - CHECK_SI_SIZE (_sigfault, 8*sizeof(int)); > > + CHECK_CSI_SIZE (_sigfault, 8*sizeof(int)); > > + CHECK_SI_SIZE (_sigfault, 16*sizeof(int)); > > > > BUILD_BUG_ON(offsetof(siginfo_t, si_addr) != 0x10); > > BUILD_BUG_ON(offsetof(compat_siginfo_t, si_addr) != 0x0C); > > @@ -138,6 +138,9 @@ static inline void signal_compat_build_tests(void) > > BUILD_BUG_ON(offsetof(siginfo_t, si_pkey) != 0x20); > > BUILD_BUG_ON(offsetof(compat_siginfo_t, si_pkey) != 0x14); > > > > + BUILD_BUG_ON(offsetof(siginfo_t, si_xflags) != 0x48); > > + BUILD_BUG_ON(offsetof(compat_siginfo_t, si_xflags) != 0x28); > > + > > CHECK_CSI_OFFSET(_sigpoll); > > CHECK_CSI_SIZE (_sigpoll, 2*sizeof(int)); > > CHECK_SI_SIZE (_sigpoll, 4*sizeof(int)); > > diff --git a/include/linux/compat.h b/include/linux/compat.h > > index 14d514233e1d..ea77a24ce6a2 100644 > > --- a/include/linux/compat.h > > +++ b/include/linux/compat.h > > @@ -236,7 +236,9 @@ typedef struct compat_siginfo { > > char _dummy_pkey[__COMPAT_ADDR_BND_PKEY_PAD]; > > u32 _pkey; > > } _addr_pkey; > > + compat_uptr_t _pad[6]; > > }; > > + u32 _xflags; > > } _sigfault; > > > > /* SIGPOLL */ > > diff --git a/include/linux/signal_types.h b/include/linux/signal_types.h > > index a7887ad84d36..75ca861d982a 100644 > > --- a/include/linux/signal_types.h > > +++ b/include/linux/signal_types.h > > @@ -78,6 +78,6 @@ struct ksignal { > > > > #define UAPI_SA_FLAGS \ > > (SA_NOCLDSTOP | SA_NOCLDWAIT | SA_SIGINFO | SA_ONSTACK | SA_RESTART | \ > > - SA_NODEFER | SA_RESETHAND | __ARCH_UAPI_SA_FLAGS) > > + SA_NODEFER | SA_RESETHAND | SA_XFLAGS | __ARCH_UAPI_SA_FLAGS) > > > > #endif /* _LINUX_SIGNAL_TYPES_H */ > > diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h > > index 7aacf9389010..8158d5df666a 100644 > > --- a/include/uapi/asm-generic/siginfo.h > > +++ b/include/uapi/asm-generic/siginfo.h > > @@ -91,7 +91,9 @@ union __sifields { > > char _dummy_pkey[__ADDR_BND_PKEY_PAD]; > > __u32 _pkey; > > } _addr_pkey; > > + void *_pad[6]; > > }; > > + __u32 _xflags; > > } _sigfault; > > > > /* SIGPOLL */ > > @@ -152,6 +154,8 @@ typedef struct siginfo { > > #define si_trapno _sifields._sigfault._trapno > > #endif > > #define si_addr_lsb _sifields._sigfault._addr_lsb > > +/* si_xflags is only valid if 0 < si_code < SI_KERNEL */ > > +#define si_xflags _sifields._sigfault._xflags > > #define si_lower _sifields._sigfault._addr_bnd._lower > > #define si_upper _sifields._sigfault._addr_bnd._upper > > #define si_pkey _sifields._sigfault._addr_pkey._pkey > > diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h > > index 0126ebda4d31..cd522819f4ba 100644 > > --- a/include/uapi/asm-generic/signal-defs.h > > +++ b/include/uapi/asm-generic/signal-defs.h > > @@ -20,6 +20,9 @@ > > * so this bit allows flag bit support to be detected from userspace while > > * allowing an old kernel to be distinguished from a kernel that supports every > > * flag bit. > > + * SA_XFLAGS indicates that the signal handler requires the siginfo.si_xflags > > + * field to be valid. Note that if the kernel supports SA_XFLAGS, the field will > > + * be valid regardless of the value of this flag. > > * > > * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single > > * Unix names RESETHAND and NODEFER respectively. > > @@ -49,6 +52,7 @@ > > #define SA_RESETHAND 0x80000000 > > #endif > > #define SA_UNSUPPORTED 0x00000400 > > +#define SA_XFLAGS 0x00000800 > > > > #define SA_NOMASK SA_NODEFER > > #define SA_ONESHOT SA_RESETHAND > > diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h > > index a71b6e3b03eb..93946edf0139 100644 > > --- a/include/uapi/linux/ptrace.h > > +++ b/include/uapi/linux/ptrace.h > > @@ -101,6 +101,18 @@ struct ptrace_syscall_info { > > }; > > }; > > > > +#define PTRACE_SETSIGINFO2 0x420f > > +/* > > + * These flags are passed as the addr argument to ptrace. > > + */ > > + > > +/* > > + * Asserts that the caller is aware of the field siginfo.si_xflags. Prevents > > + * the kernel from automatically setting the field to 0 when the signal uses > > + * a sigfault layout. > > + */ > > +#define PTRACE_SIGINFO_XFLAGS 0x1 > > + > > /* > > * These values are stored in task->ptrace_message > > * by tracehook_report_syscall_* to describe the current syscall-stop. > > diff --git a/kernel/ptrace.c b/kernel/ptrace.c > > index 43d6179508d6..85b5b4e38661 100644 > > --- a/kernel/ptrace.c > > +++ b/kernel/ptrace.c > > @@ -687,18 +687,32 @@ static int ptrace_getsiginfo(struct task_struct *child, kernel_siginfo_t *info) > > return error; > > } > > > > -static int ptrace_setsiginfo(struct task_struct *child, const kernel_siginfo_t *info) > > +static int ptrace_setsiginfo(struct task_struct *child, unsigned long flags, > > + kernel_siginfo_t *info) > > { > > - unsigned long flags; > > + unsigned long lock_flags; > > int error = -ESRCH; > > > > - if (lock_task_sighand(child, &flags)) { > > + if (flags & ~PTRACE_SIGINFO_XFLAGS) { > > + return -EINVAL; > > + } > > + > > + /* > > + * If the caller is unaware of si_xflags and we're using a layout that > > + * requires it, set it to 0 which means "no fields are available". > > + */ > > + if (!(flags & PTRACE_SIGINFO_XFLAGS) && > > + siginfo_layout_is_fault( > > + siginfo_layout(info->si_signo, info->si_code))) > > + info->si_xflags = 0; > > + > > + if (lock_task_sighand(child, &lock_flags)) { > > error = -EINVAL; > > if (likely(child->last_siginfo != NULL)) { > > copy_siginfo(child->last_siginfo, info); > > error = 0; > > } > > - unlock_task_sighand(child, &flags); > > + unlock_task_sighand(child, &lock_flags); > > } > > return error; > > } > > @@ -1038,9 +1052,12 @@ int ptrace_request(struct task_struct *child, long request, > > break; > > > > case PTRACE_SETSIGINFO: > > + addr = 0; > > If this is intended to fall through, please add a > > /* fall through */ > > comment here (newer GCC has warnings to catch this; not sure about > clang, but I'd be surprised if no version warns). Yes, clang has this warning, but it looks like it is currently disabled in clang due to differences between the compilers [1] so I didn't see it. It looks like the kernel is moving towards using the fallthrough macro/attribute defined in include/linux/compiler_attributes.h (and to me this personally seems better than relying on parsing comments), so I've used that macro in v13. Peter [1] https://github.com/ClangBuiltLinux/linux/issues/636 ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v12 7/8] signal: define the field siginfo.si_xflags 2020-11-03 4:10 ` Peter Collingbourne @ 2020-11-03 11:44 ` Dave Martin 0 siblings, 0 replies; 17+ messages in thread From: Dave Martin @ 2020-11-03 11:44 UTC (permalink / raw) To: Peter Collingbourne Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, Linux API, David Spickett, Linux ARM, Richard Henderson On Mon, Nov 02, 2020 at 08:10:57PM -0800, Peter Collingbourne wrote: > On Mon, Nov 2, 2020 at 9:38 AM Dave Martin <Dave.Martin@arm.com> wrote: > > > > On Fri, Oct 16, 2020 at 05:12:32PM -0700, Peter Collingbourne wrote: > > > This field will contain flags that may be used by signal handlers to > > > determine whether other fields in the _sigfault portion of siginfo are > > > valid. An example use case is the following patch, which introduces > > > the si_addr_tag_bits{,_mask} fields. > > > > > > A new sigcontext flag, SA_XFLAGS, is introduced in order to allow > > > a signal handler to require the kernel to set the field (but note > > > that the field will be set anyway if the kernel supports the flag, > > > regardless of its value). In combination with the previous patches, > > > this allows a userspace program to determine whether the kernel will > > > set the field. > > > > Apologies for this coming rather late: > > > > It occurs to me that we might want a more specific name, since this only > > applies to fault signals -- say, SA_FAULTFLAGS. > > > > If we end up wanting to add flags fields for other signal types, then we > > might end up needing a SA_ flag for each, which would be a bit annoying. > > > > So, alternatively. I wonder whether it's worth preemptively adding an > > extra flags to every kind of kernel-generated siginfo. If so, then > > having a single SA_XFLAGS would be fine. > > > > > > If added flags fields all over the place is considered overkill, then I > > guess it's sufficient to rename this flag. > > > > If renaming, the actual flags field in siginfo should also be renamed to > > match. > > I'd prefer not to add flags fields to every union member at this > point. I agree that faultflags is a better name, and I guess it's one > more reason not to try and reuse the ia64 field. Renamed in v13. Ack -- I thought I should make the point, but we've got enough spare sa_flags bits for now to make this one SIL_FAULT-specific, providing the SA_foo name looks equally specific -- so just renaming that should be OK. If we end up adding a flags field to another siginfo union member in the future, it's probably worth adding all the rest at the same time ... but it may never happen. [...] > > > diff --git a/kernel/ptrace.c b/kernel/ptrace.c > > > index 43d6179508d6..85b5b4e38661 100644 > > > --- a/kernel/ptrace.c > > > +++ b/kernel/ptrace.c > > > @@ -687,18 +687,32 @@ static int ptrace_getsiginfo(struct task_struct *child, kernel_siginfo_t *info) > > > return error; > > > } > > > > > > -static int ptrace_setsiginfo(struct task_struct *child, const kernel_siginfo_t *info) > > > +static int ptrace_setsiginfo(struct task_struct *child, unsigned long flags, > > > + kernel_siginfo_t *info) > > > { > > > - unsigned long flags; > > > + unsigned long lock_flags; > > > int error = -ESRCH; > > > > > > - if (lock_task_sighand(child, &flags)) { > > > + if (flags & ~PTRACE_SIGINFO_XFLAGS) { > > > + return -EINVAL; > > > + } > > > + > > > + /* > > > + * If the caller is unaware of si_xflags and we're using a layout that > > > + * requires it, set it to 0 which means "no fields are available". > > > + */ > > > + if (!(flags & PTRACE_SIGINFO_XFLAGS) && > > > + siginfo_layout_is_fault( > > > + siginfo_layout(info->si_signo, info->si_code))) > > > + info->si_xflags = 0; > > > + > > > + if (lock_task_sighand(child, &lock_flags)) { > > > error = -EINVAL; > > > if (likely(child->last_siginfo != NULL)) { > > > copy_siginfo(child->last_siginfo, info); > > > error = 0; > > > } > > > - unlock_task_sighand(child, &flags); > > > + unlock_task_sighand(child, &lock_flags); > > > } > > > return error; > > > } > > > @@ -1038,9 +1052,12 @@ int ptrace_request(struct task_struct *child, long request, > > > break; > > > > > > case PTRACE_SETSIGINFO: > > > + addr = 0; > > > > If this is intended to fall through, please add a > > > > /* fall through */ > > > > comment here (newer GCC has warnings to catch this; not sure about > > clang, but I'd be surprised if no version warns). > > Yes, clang has this warning, but it looks like it is currently > disabled in clang due to differences between the compilers [1] so I > didn't see it. > > It looks like the kernel is moving towards using the fallthrough > macro/attribute defined in include/linux/compiler_attributes.h (and to > me this personally seems better than relying on parsing comments), so > I've used that macro in v13. Ah, I wasn't aware of that. Sounds better! Cheers ---Dave ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne ` (6 preceding siblings ...) 2020-10-17 0:12 ` [PATCH v12 7/8] signal: define the field siginfo.si_xflags Peter Collingbourne @ 2020-10-17 0:12 ` Peter Collingbourne 2020-11-02 17:54 ` Dave Martin 7 siblings, 1 reply; 17+ messages in thread From: Peter Collingbourne @ 2020-10-17 0:12 UTC (permalink / raw) To: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Dave Martin, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley Cc: Peter Collingbourne, Linux ARM, Kevin Brodsky, Andrey Konovalov, Richard Henderson, linux-api, Helge Deller, David Spickett The kernel currently clears the tag bits (i.e. bits 56-63) in the fault address exposed via siginfo.si_addr and sigcontext.fault_address. However, the tag bits may be needed by tools in order to accurately diagnose memory errors, such as HWASan [1] or future tools based on the Memory Tagging Extension (MTE). We should not stop clearing these bits in the existing fault address fields, because there may be existing userspace applications that are expecting the tag bits to be cleared. Instead, create a new pair of union fields in siginfo._sigfault, and store the tag bits of FAR_EL1 there, together with a mask specifying which bits are valid. A flag is added to si_xflags to allow userspace to determine whether the values in the fields are valid. [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html Signed-off-by: Peter Collingbourne <pcc@google.com> Link: https://linux-review.googlesource.com/id/Ia8876bad8c798e0a32df7c2ce1256c4771c81446 --- v12: - add new fields to signal_compat.c test cases - rebased to 5.10-rc1 - mask out bits 63:60 for tag check faults v11: - add a comment explaining what the arch hook should do - rename ignored bits to tag bits v10: - rename the flag to SIXFLAG_ADDR_IGNORED_BITS - use an arch hook to specify which bits are ignored, instead of passing them explicitly - while refactoring for the arch hook, noticed that my previous patches missed a case involving cache maintenance instructions, so expose the tag bits for that signal as well v9: - make the ignored bits fields generic - add some new dependent patches that prepare us to store the field in such a way that userspace can detect their presence v8: - rebase onto 5.8rc2 v7: - switch to a new siginfo field instead of using sigcontext - merge the patch back into one since the other patches are now unnecessary v6: - move fault address and fault code into the kernel_siginfo data structure - split the patch in three since it was getting large and now has generic and arch-specific parts v5: - add padding to fault_addr_top_byte_context in order to ensure the correct size and preserve sp alignment v4: - expose only the tag bits in the context instead of the entire FAR_EL1 - remove mention of the new context from the sigcontext.__reserved[] note v3: - add documentation to tagged-pointers.rst - update comments in sigcontext.h v2: - revert changes to hw_breakpoint.c - rename set_thread_esr to set_thread_far_esr Documentation/arm64/tagged-pointers.rst | 21 +++++--- arch/arm64/include/asm/exception.h | 2 +- arch/arm64/include/asm/signal.h | 19 +++++++ arch/arm64/include/asm/system_misc.h | 2 +- arch/arm64/include/asm/traps.h | 6 +-- arch/arm64/kernel/debug-monitors.c | 5 +- arch/arm64/kernel/entry-common.c | 2 - arch/arm64/kernel/ptrace.c | 7 +-- arch/arm64/kernel/sys_compat.c | 5 +- arch/arm64/kernel/traps.c | 29 ++++++----- arch/arm64/mm/fault.c | 68 ++++++++++++++----------- arch/x86/kernel/signal_compat.c | 9 +++- include/linux/compat.h | 2 + include/linux/signal.h | 16 ++++++ include/uapi/asm-generic/siginfo.h | 10 ++++ kernel/signal.c | 18 ++++++- 16 files changed, 148 insertions(+), 73 deletions(-) create mode 100644 arch/arm64/include/asm/signal.h diff --git a/Documentation/arm64/tagged-pointers.rst b/Documentation/arm64/tagged-pointers.rst index eab4323609b9..032c09a876f4 100644 --- a/Documentation/arm64/tagged-pointers.rst +++ b/Documentation/arm64/tagged-pointers.rst @@ -53,12 +53,21 @@ visibility. Preserving tags --------------- -Non-zero tags are not preserved when delivering signals. This means that -signal handlers in applications making use of tags cannot rely on the -tag information for user virtual addresses being maintained for fields -inside siginfo_t. One exception to this rule is for signals raised in -response to watchpoint debug exceptions, where the tag information will -be preserved. +Non-zero tags are not preserved in the fault address fields +siginfo.si_addr or sigcontext.fault_address when delivering +signals. This means that signal handlers in applications making use +of tags cannot rely on the tag information for user virtual addresses +being maintained in these fields. One exception to this rule is for +signals raised in response to watchpoint debug exceptions, where the +tag information will be preserved. + +The fault address tag is preserved in the si_addr_tag_bits field +of siginfo, which is set for signals raised in response to data aborts +and instruction aborts. The si_addr_tag_bits_mask field indicates +which bits of the field are valid. The validity of these fields is +indicated by the SIXFLAG_ADDR_TAG_BITS flag in siginfo.si_xflags, +and the validity of si_xflags in turn is indicated by the kernel +indicating support for the sigaction.sa_flags flag SA_XFLAGS. The architecture prevents the use of a tagged PC, so the upper byte will be set to a sign-extension of bit 55 on exception return. diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h index 99b9383cd036..2a8aa1884d8a 100644 --- a/arch/arm64/include/asm/exception.h +++ b/arch/arm64/include/asm/exception.h @@ -32,7 +32,7 @@ static inline u32 disr_to_esr(u64 disr) } asmlinkage void enter_from_user_mode(void); -void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); +void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs); void do_undefinstr(struct pt_regs *regs); void do_bti(struct pt_regs *regs); asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); diff --git a/arch/arm64/include/asm/signal.h b/arch/arm64/include/asm/signal.h new file mode 100644 index 000000000000..46f9b3c61896 --- /dev/null +++ b/arch/arm64/include/asm/signal.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ARM64_ASM_SIGNAL_H +#define __ARM64_ASM_SIGNAL_H + +#include <uapi/asm/signal.h> +#include <uapi/asm/siginfo.h> + +static inline unsigned long arch_addr_tag_bits_mask(unsigned long sig, + unsigned long si_code) +{ + if (sig == SIGTRAP && si_code == TRAP_BRKPT) + return 0; + if (sig == SIGSEGV && si_code == SEGV_MTESERR) + return 0xfUL << 56; + return 0xffUL << 56; +} +#define arch_addr_tag_bits_mask arch_addr_tag_bits_mask + +#endif diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h index 1ab63cfbbaf1..673be2d1263c 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -22,7 +22,7 @@ void die(const char *msg, struct pt_regs *regs, int err); struct siginfo; void arm64_notify_die(const char *str, struct pt_regs *regs, - int signo, int sicode, void __user *addr, + int signo, int sicode, unsigned long far, int err); void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int, diff --git a/arch/arm64/include/asm/traps.h b/arch/arm64/include/asm/traps.h index d96dc2c7c09d..54f32a0675df 100644 --- a/arch/arm64/include/asm/traps.h +++ b/arch/arm64/include/asm/traps.h @@ -26,9 +26,9 @@ void register_undef_hook(struct undef_hook *hook); void unregister_undef_hook(struct undef_hook *hook); void force_signal_inject(int signal, int code, unsigned long address, unsigned int err); void arm64_notify_segfault(unsigned long addr); -void arm64_force_sig_fault(int signo, int code, void __user *addr, const char *str); -void arm64_force_sig_mceerr(int code, void __user *addr, short lsb, const char *str); -void arm64_force_sig_ptrace_errno_trap(int errno, void __user *addr, const char *str); +void arm64_force_sig_fault(int signo, int code, unsigned long far, const char *str); +void arm64_force_sig_mceerr(int code, unsigned long far, short lsb, const char *str); +void arm64_force_sig_ptrace_errno_trap(int errno, unsigned long far, const char *str); /* * Move regs->pc to next instruction and do necessary setup before it diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index fa76151de6ff..4f3661eeb7ec 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -234,9 +234,8 @@ static void send_user_sigtrap(int si_code) if (interrupts_enabled(regs)) local_irq_enable(); - arm64_force_sig_fault(SIGTRAP, si_code, - (void __user *)instruction_pointer(regs), - "User debug trap"); + arm64_force_sig_fault(SIGTRAP, si_code, instruction_pointer(regs), + "User debug trap"); } static int single_step_handler(unsigned long unused, unsigned int esr, diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c index 43d4c329775f..dbbddfbf4a72 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -22,7 +22,6 @@ static void notrace el1_abort(struct pt_regs *regs, unsigned long esr) unsigned long far = read_sysreg(far_el1); local_daif_inherit(regs); - far = untagged_addr(far); do_mem_abort(far, esr, regs); } NOKPROBE_SYMBOL(el1_abort); @@ -114,7 +113,6 @@ static void notrace el0_da(struct pt_regs *regs, unsigned long esr) user_exit_irqoff(); local_daif_restore(DAIF_PROCCTX); - far = untagged_addr(far); do_mem_abort(far, esr, regs); } NOKPROBE_SYMBOL(el0_da); diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index f49b349e16a3..8ac487c84e37 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -192,14 +192,11 @@ static void ptrace_hbptriggered(struct perf_event *bp, break; } } - arm64_force_sig_ptrace_errno_trap(si_errno, - (void __user *)bkpt->trigger, + arm64_force_sig_ptrace_errno_trap(si_errno, bkpt->trigger, desc); } #endif - arm64_force_sig_fault(SIGTRAP, TRAP_HWBKPT, - (void __user *)(bkpt->trigger), - desc); + arm64_force_sig_fault(SIGTRAP, TRAP_HWBKPT, bkpt->trigger, desc); } /* diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c index 3c18c2454089..265fe3eb1069 100644 --- a/arch/arm64/kernel/sys_compat.c +++ b/arch/arm64/kernel/sys_compat.c @@ -68,7 +68,7 @@ do_compat_cache_op(unsigned long start, unsigned long end, int flags) */ long compat_arm_syscall(struct pt_regs *regs, int scno) { - void __user *addr; + unsigned long addr; switch (scno) { /* @@ -111,8 +111,7 @@ long compat_arm_syscall(struct pt_regs *regs, int scno) break; } - addr = (void __user *)instruction_pointer(regs) - - (compat_thumb_mode(regs) ? 2 : 4); + addr = instruction_pointer(regs) - (compat_thumb_mode(regs) ? 2 : 4); arm64_notify_die("Oops - bad compat syscall(2)", regs, SIGILL, ILL_ILLTRP, addr, scno); diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 8af4e0e85736..f4ddbe9ed3f1 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -170,32 +170,32 @@ static void arm64_show_signal(int signo, const char *str) __show_regs(regs); } -void arm64_force_sig_fault(int signo, int code, void __user *addr, +void arm64_force_sig_fault(int signo, int code, unsigned long far, const char *str) { arm64_show_signal(signo, str); if (signo == SIGKILL) force_sig(SIGKILL); else - force_sig_fault(signo, code, addr); + force_sig_fault(signo, code, (void __user *)far); } -void arm64_force_sig_mceerr(int code, void __user *addr, short lsb, +void arm64_force_sig_mceerr(int code, unsigned long far, short lsb, const char *str) { arm64_show_signal(SIGBUS, str); - force_sig_mceerr(code, addr, lsb); + force_sig_mceerr(code, (void __user *)far, lsb); } -void arm64_force_sig_ptrace_errno_trap(int errno, void __user *addr, +void arm64_force_sig_ptrace_errno_trap(int errno, unsigned long far, const char *str) { arm64_show_signal(SIGTRAP, str); - force_sig_ptrace_errno_trap(errno, addr); + force_sig_ptrace_errno_trap(errno, (void __user *)far); } void arm64_notify_die(const char *str, struct pt_regs *regs, - int signo, int sicode, void __user *addr, + int signo, int sicode, unsigned long far, int err) { if (user_mode(regs)) { @@ -203,7 +203,7 @@ void arm64_notify_die(const char *str, struct pt_regs *regs, current->thread.fault_address = 0; current->thread.fault_code = err; - arm64_force_sig_fault(signo, sicode, addr, str); + arm64_force_sig_fault(signo, sicode, far, str); } else { die(str, regs, err); } @@ -374,7 +374,7 @@ void force_signal_inject(int signal, int code, unsigned long address, unsigned i signal = SIGKILL; } - arm64_notify_die(desc, regs, signal, code, (void __user *)address, err); + arm64_notify_die(desc, regs, signal, code, address, err); } /* @@ -385,7 +385,7 @@ void arm64_notify_segfault(unsigned long addr) int code; mmap_read_lock(current->mm); - if (find_vma(current->mm, addr) == NULL) + if (find_vma(current->mm, untagged_addr(addr)) == NULL) code = SEGV_MAPERR; else code = SEGV_ACCERR; @@ -448,12 +448,13 @@ NOKPROBE_SYMBOL(do_ptrauth_fault); static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs) { - unsigned long address; + unsigned long tagged_address, address; int rt = ESR_ELx_SYS64_ISS_RT(esr); int crm = (esr & ESR_ELx_SYS64_ISS_CRM_MASK) >> ESR_ELx_SYS64_ISS_CRM_SHIFT; int ret = 0; - address = untagged_addr(pt_regs_read_reg(regs, rt)); + tagged_address = pt_regs_read_reg(regs, rt); + address = untagged_addr(tagged_address); switch (crm) { case ESR_ELx_SYS64_ISS_CRM_DC_CVAU: /* DC CVAU, gets promoted */ @@ -480,7 +481,7 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs) } if (ret) - arm64_notify_segfault(address); + arm64_notify_segfault(tagged_address); else arm64_skip_faulting_instruction(regs, AARCH64_INSN_SIZE); } @@ -772,7 +773,7 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) */ void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr) { - void __user *pc = (void __user *)instruction_pointer(regs); + unsigned long pc = instruction_pointer(regs); current->thread.fault_address = 0; current->thread.fault_code = esr; diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 94c99c1c19e3..1d9d678cfc01 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -40,7 +40,7 @@ #include <asm/traps.h> struct fault_info { - int (*fn)(unsigned long addr, unsigned int esr, + int (*fn)(unsigned long far, unsigned int esr, struct pt_regs *regs); int sig; int code; @@ -385,8 +385,11 @@ static void set_thread_esr(unsigned long address, unsigned int esr) current->thread.fault_code = esr; } -static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *regs) +static void do_bad_area(unsigned long far, unsigned int esr, + struct pt_regs *regs) { + unsigned long addr = untagged_addr(far); + /* * If we are in kernel mode at this point, we have no context to * handle this fault with. @@ -395,8 +398,7 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re const struct fault_info *inf = esr_to_fault_info(esr); set_thread_esr(addr, esr); - arm64_force_sig_fault(inf->sig, inf->code, (void __user *)addr, - inf->name); + arm64_force_sig_fault(inf->sig, inf->code, far, inf->name); } else { __do_kernel_fault(addr, esr, regs); } @@ -448,7 +450,7 @@ static bool is_write_abort(unsigned int esr) return (esr & ESR_ELx_WNR) && !(esr & ESR_ELx_CM); } -static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, +static int __kprobes do_page_fault(unsigned long far, unsigned int esr, struct pt_regs *regs) { const struct fault_info *inf; @@ -456,6 +458,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, vm_fault_t fault; unsigned long vm_flags = VM_ACCESS_FLAGS; unsigned int mm_flags = FAULT_FLAG_DEFAULT; + unsigned long addr = untagged_addr(far); if (kprobe_page_fault(regs, esr)) return 0; @@ -567,8 +570,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, * We had some memory, but were unable to successfully fix up * this page fault. */ - arm64_force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)addr, - inf->name); + arm64_force_sig_fault(SIGBUS, BUS_ADRERR, far, inf->name); } else if (fault & (VM_FAULT_HWPOISON_LARGE | VM_FAULT_HWPOISON)) { unsigned int lsb; @@ -576,8 +578,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, if (fault & VM_FAULT_HWPOISON_LARGE) lsb = hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault)); - arm64_force_sig_mceerr(BUS_MCEERR_AR, (void __user *)addr, lsb, - inf->name); + arm64_force_sig_mceerr(BUS_MCEERR_AR, far, lsb, inf->name); } else { /* * Something tried to access memory that isn't in our memory @@ -585,8 +586,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, */ arm64_force_sig_fault(SIGSEGV, fault == VM_FAULT_BADACCESS ? SEGV_ACCERR : SEGV_MAPERR, - (void __user *)addr, - inf->name); + far, inf->name); } return 0; @@ -596,33 +596,35 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, return 0; } -static int __kprobes do_translation_fault(unsigned long addr, +static int __kprobes do_translation_fault(unsigned long far, unsigned int esr, struct pt_regs *regs) { + unsigned long addr = untagged_addr(far); + if (is_ttbr0_addr(addr)) - return do_page_fault(addr, esr, regs); + return do_page_fault(far, esr, regs); - do_bad_area(addr, esr, regs); + do_bad_area(far, esr, regs); return 0; } -static int do_alignment_fault(unsigned long addr, unsigned int esr, +static int do_alignment_fault(unsigned long far, unsigned int esr, struct pt_regs *regs) { - do_bad_area(addr, esr, regs); + do_bad_area(far, esr, regs); return 0; } -static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs) +static int do_bad(unsigned long far, unsigned int esr, struct pt_regs *regs) { return 1; /* "fault" */ } -static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs) +static int do_sea(unsigned long far, unsigned int esr, struct pt_regs *regs) { const struct fault_info *inf; - void __user *siaddr; + unsigned long siaddr; inf = esr_to_fault_info(esr); @@ -635,18 +637,23 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs) } if (esr & ESR_ELx_FnV) - siaddr = NULL; + siaddr = 0; else - siaddr = (void __user *)addr; + siaddr = untagged_addr(far); arm64_notify_die(inf->name, regs, inf->sig, inf->code, siaddr, esr); return 0; } -static int do_tag_check_fault(unsigned long addr, unsigned int esr, +static int do_tag_check_fault(unsigned long far, unsigned int esr, struct pt_regs *regs) { - do_bad_area(addr, esr, regs); + /* + * The architecture specifies that bits 63:60 of FAR_EL1 are UNKNOWN for tag + * check faults. Mask them out now so that userspace doesn't see them. + */ + far &= (1UL << 60) - 1; + do_bad_area(far, esr, regs); return 0; } @@ -717,11 +724,12 @@ static const struct fault_info fault_info[] = { { do_bad, SIGKILL, SI_KERNEL, "unknown 63" }, }; -void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs) +void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs) { const struct fault_info *inf = esr_to_fault_info(esr); + unsigned long addr = untagged_addr(far); - if (!inf->fn(addr, esr, regs)) + if (!inf->fn(far, esr, regs)) return; if (!user_mode(regs)) { @@ -730,8 +738,7 @@ void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs) show_pte(addr); } - arm64_notify_die(inf->name, regs, - inf->sig, inf->code, (void __user *)addr, esr); + arm64_notify_die(inf->name, regs, inf->sig, inf->code, addr, esr); } NOKPROBE_SYMBOL(do_mem_abort); @@ -744,8 +751,8 @@ NOKPROBE_SYMBOL(do_el0_irq_bp_hardening); void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs) { - arm64_notify_die("SP/PC alignment exception", regs, - SIGBUS, BUS_ADRALN, (void __user *)addr, esr); + arm64_notify_die("SP/PC alignment exception", regs, SIGBUS, BUS_ADRALN, + addr, esr); } NOKPROBE_SYMBOL(do_sp_pc_abort); @@ -871,8 +878,7 @@ void do_debug_exception(unsigned long addr_if_watchpoint, unsigned int esr, arm64_apply_bp_hardening(); if (inf->fn(addr_if_watchpoint, esr, regs)) { - arm64_notify_die(inf->name, regs, - inf->sig, inf->code, (void __user *)pc, esr); + arm64_notify_die(inf->name, regs, inf->sig, inf->code, pc, esr); } debug_exception_exit(regs); diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index 243a8cc3b41b..aa33674a4972 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -121,8 +121,8 @@ static inline void signal_compat_build_tests(void) #endif CHECK_CSI_OFFSET(_sigfault); - CHECK_CSI_SIZE (_sigfault, 8*sizeof(int)); - CHECK_SI_SIZE (_sigfault, 16*sizeof(int)); + CHECK_CSI_SIZE (_sigfault, 10*sizeof(int)); + CHECK_SI_SIZE (_sigfault, 20*sizeof(int)); BUILD_BUG_ON(offsetof(siginfo_t, si_addr) != 0x10); BUILD_BUG_ON(offsetof(compat_siginfo_t, si_addr) != 0x0C); @@ -141,6 +141,11 @@ static inline void signal_compat_build_tests(void) BUILD_BUG_ON(offsetof(siginfo_t, si_xflags) != 0x48); BUILD_BUG_ON(offsetof(compat_siginfo_t, si_xflags) != 0x28); + BUILD_BUG_ON(offsetof(siginfo_t, si_addr_tag_bits) != 0x50); + BUILD_BUG_ON(offsetof(siginfo_t, si_addr_tag_bits_mask) != 0x58); + BUILD_BUG_ON(offsetof(compat_siginfo_t, si_addr_tag_bits) != 0x2C); + BUILD_BUG_ON(offsetof(compat_siginfo_t, si_addr_tag_bits_mask) != 0x30); + CHECK_CSI_OFFSET(_sigpoll); CHECK_CSI_SIZE (_sigpoll, 2*sizeof(int)); CHECK_SI_SIZE (_sigpoll, 4*sizeof(int)); diff --git a/include/linux/compat.h b/include/linux/compat.h index ea77a24ce6a2..345d029adadc 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -239,6 +239,8 @@ typedef struct compat_siginfo { compat_uptr_t _pad[6]; }; u32 _xflags; + compat_uptr_t _addr_tag_bits; + compat_uptr_t _addr_tag_bits_mask; } _sigfault; /* SIGPOLL */ diff --git a/include/linux/signal.h b/include/linux/signal.h index 9b7fef0c559d..e12f211f5c12 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -480,4 +480,20 @@ struct seq_file; extern void render_sigset_t(struct seq_file *, const char *, sigset_t *); #endif +#ifndef arch_addr_tag_bits_mask +/* + * Given a signal and si_code which correspond to the _sigfault union member, + * if tag bits are present in the fault address which must appear in + * si_addr_tag_bits instead of si_addr, this hook must return a bitmask where 1 + * corresponds to bits appearing in si_addr_tag_bits and 0 corresponds to bits + * appearing in si_addr. The value returned by this function will also be + * available in si_addr_tag_bits_mask. + */ +static inline unsigned long arch_addr_tag_bits_mask(unsigned long sig, + unsigned long si_code) +{ + return 0; +} +#endif + #endif /* _LINUX_SIGNAL_H */ diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h index 8158d5df666a..e5fe256c4979 100644 --- a/include/uapi/asm-generic/siginfo.h +++ b/include/uapi/asm-generic/siginfo.h @@ -94,6 +94,8 @@ union __sifields { void *_pad[6]; }; __u32 _xflags; + unsigned long _addr_tag_bits; + unsigned long _addr_tag_bits_mask; } _sigfault; /* SIGPOLL */ @@ -156,6 +158,8 @@ typedef struct siginfo { #define si_addr_lsb _sifields._sigfault._addr_lsb /* si_xflags is only valid if 0 < si_code < SI_KERNEL */ #define si_xflags _sifields._sigfault._xflags +#define si_addr_tag_bits _sifields._sigfault._addr_tag_bits +#define si_addr_tag_bits_mask _sifields._sigfault._addr_tag_bits_mask #define si_lower _sifields._sigfault._addr_bnd._lower #define si_upper _sifields._sigfault._addr_bnd._upper #define si_pkey _sifields._sigfault._addr_pkey._pkey @@ -298,6 +302,12 @@ typedef struct siginfo { #define EMT_TAGOVF 1 /* tag overflow */ #define NSIGEMT 1 +/* + * SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGTRAP, SIGEMT si_xflags + */ +#define SIXFLAG_ADDR_TAG_BITS 1 +/* si_addr_tag_bits{,_mask} fields valid */ + /* * sigevent definitions * diff --git a/kernel/signal.c b/kernel/signal.c index 5c715a01942f..f41b40c9caf1 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1652,11 +1652,16 @@ void force_sigsegv(int sig) static void set_sigfault_common_fields(struct kernel_siginfo *info, int sig, int code, void __user *addr) { + unsigned long addr_long = (unsigned long)addr; + unsigned long tag_bits_mask = arch_addr_tag_bits_mask(sig, code); + info->si_signo = sig; info->si_errno = 0; info->si_code = code; - info->si_addr = addr; - info->si_xflags = 0; + info->si_addr = (void __user *)(addr_long & ~tag_bits_mask); + info->si_xflags = SIXFLAG_ADDR_TAG_BITS; + info->si_addr_tag_bits = addr_long & tag_bits_mask; + info->si_addr_tag_bits_mask = tag_bits_mask; } int force_sig_fault_to_task(int sig, int code, void __user *addr @@ -3271,6 +3276,13 @@ void copy_siginfo_to_external32(struct compat_siginfo *to, to->si_trapno = from->si_trapno; #endif to->si_xflags = from->si_xflags; + /* + * These assignments involve a truncation, but as with si_addr + * they will be derived from a 32-bit fault address so we + * should not expect any truncation in practice. + */ + to->si_addr_tag_bits = from->si_addr_tag_bits; + to->si_addr_tag_bits_mask = from->si_addr_tag_bits_mask; } switch (layout) { @@ -3347,6 +3359,8 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, to->si_trapno = from->si_trapno; #endif to->si_xflags = from->si_xflags; + to->si_addr_tag_bits = from->si_addr_tag_bits; + to->si_addr_tag_bits_mask = from->si_addr_tag_bits_mask; } switch (layout) { -- 2.29.0.rc1.297.gfa9743e501-goog ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo 2020-10-17 0:12 ` [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne @ 2020-11-02 17:54 ` Dave Martin 2020-11-03 3:59 ` Peter Collingbourne 0 siblings, 1 reply; 17+ messages in thread From: Dave Martin @ 2020-11-02 17:54 UTC (permalink / raw) To: Peter Collingbourne Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, linux-api, David Spickett, Linux ARM, Richard Henderson On Fri, Oct 16, 2020 at 05:12:33PM -0700, Peter Collingbourne wrote: > The kernel currently clears the tag bits (i.e. bits 56-63) in the fault > address exposed via siginfo.si_addr and sigcontext.fault_address. However, > the tag bits may be needed by tools in order to accurately diagnose > memory errors, such as HWASan [1] or future tools based on the Memory > Tagging Extension (MTE). > > We should not stop clearing these bits in the existing fault address > fields, because there may be existing userspace applications that are > expecting the tag bits to be cleared. Instead, create a new pair of > union fields in siginfo._sigfault, and store the tag bits of FAR_EL1 > there, together with a mask specifying which bits are valid. > > A flag is added to si_xflags to allow userspace to determine whether > the values in the fields are valid. > > [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html > > Signed-off-by: Peter Collingbourne <pcc@google.com> > Link: https://linux-review.googlesource.com/id/Ia8876bad8c798e0a32df7c2ce1256c4771c81446 > --- > v12: > - add new fields to signal_compat.c test cases > - rebased to 5.10-rc1 > - mask out bits 63:60 for tag check faults > > v11: > - add a comment explaining what the arch hook should do > - rename ignored bits to tag bits > > v10: > - rename the flag to SIXFLAG_ADDR_IGNORED_BITS > - use an arch hook to specify which bits are ignored, instead > of passing them explicitly > - while refactoring for the arch hook, noticed that my previous > patches missed a case involving cache maintenance instructions, > so expose the tag bits for that signal as well > > v9: > - make the ignored bits fields generic > - add some new dependent patches that prepare us to store the > field in such a way that userspace can detect their presence > > v8: > - rebase onto 5.8rc2 > > v7: > - switch to a new siginfo field instead of using sigcontext > - merge the patch back into one since the other patches are now > unnecessary > > v6: > - move fault address and fault code into the kernel_siginfo data structure > - split the patch in three since it was getting large and now has > generic and arch-specific parts > > v5: > - add padding to fault_addr_top_byte_context in order to ensure the correct > size and preserve sp alignment > > v4: > - expose only the tag bits in the context instead of the entire FAR_EL1 > - remove mention of the new context from the sigcontext.__reserved[] note > > v3: > - add documentation to tagged-pointers.rst > - update comments in sigcontext.h > > v2: > - revert changes to hw_breakpoint.c > - rename set_thread_esr to set_thread_far_esr > > Documentation/arm64/tagged-pointers.rst | 21 +++++--- > arch/arm64/include/asm/exception.h | 2 +- > arch/arm64/include/asm/signal.h | 19 +++++++ > arch/arm64/include/asm/system_misc.h | 2 +- > arch/arm64/include/asm/traps.h | 6 +-- > arch/arm64/kernel/debug-monitors.c | 5 +- > arch/arm64/kernel/entry-common.c | 2 - > arch/arm64/kernel/ptrace.c | 7 +-- > arch/arm64/kernel/sys_compat.c | 5 +- > arch/arm64/kernel/traps.c | 29 ++++++----- > arch/arm64/mm/fault.c | 68 ++++++++++++++----------- > arch/x86/kernel/signal_compat.c | 9 +++- > include/linux/compat.h | 2 + > include/linux/signal.h | 16 ++++++ > include/uapi/asm-generic/siginfo.h | 10 ++++ > kernel/signal.c | 18 ++++++- > 16 files changed, 148 insertions(+), 73 deletions(-) > create mode 100644 arch/arm64/include/asm/signal.h > > diff --git a/Documentation/arm64/tagged-pointers.rst b/Documentation/arm64/tagged-pointers.rst > index eab4323609b9..032c09a876f4 100644 > --- a/Documentation/arm64/tagged-pointers.rst > +++ b/Documentation/arm64/tagged-pointers.rst > @@ -53,12 +53,21 @@ visibility. > Preserving tags > --------------- > > -Non-zero tags are not preserved when delivering signals. This means that > -signal handlers in applications making use of tags cannot rely on the > -tag information for user virtual addresses being maintained for fields > -inside siginfo_t. One exception to this rule is for signals raised in > -response to watchpoint debug exceptions, where the tag information will > -be preserved. > +Non-zero tags are not preserved in the fault address fields > +siginfo.si_addr or sigcontext.fault_address when delivering > +signals. This means that signal handlers in applications making use > +of tags cannot rely on the tag information for user virtual addresses > +being maintained in these fields. One exception to this rule is for > +signals raised in response to watchpoint debug exceptions, where the > +tag information will be preserved. > + > +The fault address tag is preserved in the si_addr_tag_bits field > +of siginfo, which is set for signals raised in response to data aborts > +and instruction aborts. The si_addr_tag_bits_mask field indicates > +which bits of the field are valid. The validity of these fields is > +indicated by the SIXFLAG_ADDR_TAG_BITS flag in siginfo.si_xflags, > +and the validity of si_xflags in turn is indicated by the kernel > +indicating support for the sigaction.sa_flags flag SA_XFLAGS. > > The architecture prevents the use of a tagged PC, so the upper byte will > be set to a sign-extension of bit 55 on exception return. > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h > index 99b9383cd036..2a8aa1884d8a 100644 > --- a/arch/arm64/include/asm/exception.h > +++ b/arch/arm64/include/asm/exception.h > @@ -32,7 +32,7 @@ static inline u32 disr_to_esr(u64 disr) > } > > asmlinkage void enter_from_user_mode(void); > -void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > +void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs); > void do_undefinstr(struct pt_regs *regs); > void do_bti(struct pt_regs *regs); > asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); > diff --git a/arch/arm64/include/asm/signal.h b/arch/arm64/include/asm/signal.h > new file mode 100644 > index 000000000000..46f9b3c61896 > --- /dev/null > +++ b/arch/arm64/include/asm/signal.h > @@ -0,0 +1,19 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef __ARM64_ASM_SIGNAL_H > +#define __ARM64_ASM_SIGNAL_H > + > +#include <uapi/asm/signal.h> > +#include <uapi/asm/siginfo.h> > + > +static inline unsigned long arch_addr_tag_bits_mask(unsigned long sig, > + unsigned long si_code) > +{ > + if (sig == SIGTRAP && si_code == TRAP_BRKPT) > + return 0; > + if (sig == SIGSEGV && si_code == SEGV_MTESERR) > + return 0xfUL << 56; Should this be 0xffUL << 56? I thought MTE ignored bits 63:60, rather than requiring them to be 0? The whole tag byte may be relevant for debugging purposes, even if only some of the bits are checked in hardware. For consistency, I wonder whether it makes sense to expose the bits as tag bits for watchpoint execeptions, even if they are left un-cleared in si_addr for historical reasons. > + return 0xffUL << 56; > +} > +#define arch_addr_tag_bits_mask arch_addr_tag_bits_mask [...] Cheers ---Dave ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo 2020-11-02 17:54 ` Dave Martin @ 2020-11-03 3:59 ` Peter Collingbourne 2020-11-03 11:49 ` Dave Martin 0 siblings, 1 reply; 17+ messages in thread From: Peter Collingbourne @ 2020-11-03 3:59 UTC (permalink / raw) To: Dave Martin Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, Linux API, David Spickett, Linux ARM, Richard Henderson On Mon, Nov 2, 2020 at 9:55 AM Dave Martin <Dave.Martin@arm.com> wrote: > > On Fri, Oct 16, 2020 at 05:12:33PM -0700, Peter Collingbourne wrote: > > The kernel currently clears the tag bits (i.e. bits 56-63) in the fault > > address exposed via siginfo.si_addr and sigcontext.fault_address. However, > > the tag bits may be needed by tools in order to accurately diagnose > > memory errors, such as HWASan [1] or future tools based on the Memory > > Tagging Extension (MTE). > > > > We should not stop clearing these bits in the existing fault address > > fields, because there may be existing userspace applications that are > > expecting the tag bits to be cleared. Instead, create a new pair of > > union fields in siginfo._sigfault, and store the tag bits of FAR_EL1 > > there, together with a mask specifying which bits are valid. > > > > A flag is added to si_xflags to allow userspace to determine whether > > the values in the fields are valid. > > > > [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html > > > > Signed-off-by: Peter Collingbourne <pcc@google.com> > > Link: https://linux-review.googlesource.com/id/Ia8876bad8c798e0a32df7c2ce1256c4771c81446 > > --- > > v12: > > - add new fields to signal_compat.c test cases > > - rebased to 5.10-rc1 > > - mask out bits 63:60 for tag check faults > > > > v11: > > - add a comment explaining what the arch hook should do > > - rename ignored bits to tag bits > > > > v10: > > - rename the flag to SIXFLAG_ADDR_IGNORED_BITS > > - use an arch hook to specify which bits are ignored, instead > > of passing them explicitly > > - while refactoring for the arch hook, noticed that my previous > > patches missed a case involving cache maintenance instructions, > > so expose the tag bits for that signal as well > > > > v9: > > - make the ignored bits fields generic > > - add some new dependent patches that prepare us to store the > > field in such a way that userspace can detect their presence > > > > v8: > > - rebase onto 5.8rc2 > > > > v7: > > - switch to a new siginfo field instead of using sigcontext > > - merge the patch back into one since the other patches are now > > unnecessary > > > > v6: > > - move fault address and fault code into the kernel_siginfo data structure > > - split the patch in three since it was getting large and now has > > generic and arch-specific parts > > > > v5: > > - add padding to fault_addr_top_byte_context in order to ensure the correct > > size and preserve sp alignment > > > > v4: > > - expose only the tag bits in the context instead of the entire FAR_EL1 > > - remove mention of the new context from the sigcontext.__reserved[] note > > > > v3: > > - add documentation to tagged-pointers.rst > > - update comments in sigcontext.h > > > > v2: > > - revert changes to hw_breakpoint.c > > - rename set_thread_esr to set_thread_far_esr > > > > Documentation/arm64/tagged-pointers.rst | 21 +++++--- > > arch/arm64/include/asm/exception.h | 2 +- > > arch/arm64/include/asm/signal.h | 19 +++++++ > > arch/arm64/include/asm/system_misc.h | 2 +- > > arch/arm64/include/asm/traps.h | 6 +-- > > arch/arm64/kernel/debug-monitors.c | 5 +- > > arch/arm64/kernel/entry-common.c | 2 - > > arch/arm64/kernel/ptrace.c | 7 +-- > > arch/arm64/kernel/sys_compat.c | 5 +- > > arch/arm64/kernel/traps.c | 29 ++++++----- > > arch/arm64/mm/fault.c | 68 ++++++++++++++----------- > > arch/x86/kernel/signal_compat.c | 9 +++- > > include/linux/compat.h | 2 + > > include/linux/signal.h | 16 ++++++ > > include/uapi/asm-generic/siginfo.h | 10 ++++ > > kernel/signal.c | 18 ++++++- > > 16 files changed, 148 insertions(+), 73 deletions(-) > > create mode 100644 arch/arm64/include/asm/signal.h > > > > diff --git a/Documentation/arm64/tagged-pointers.rst b/Documentation/arm64/tagged-pointers.rst > > index eab4323609b9..032c09a876f4 100644 > > --- a/Documentation/arm64/tagged-pointers.rst > > +++ b/Documentation/arm64/tagged-pointers.rst > > @@ -53,12 +53,21 @@ visibility. > > Preserving tags > > --------------- > > > > -Non-zero tags are not preserved when delivering signals. This means that > > -signal handlers in applications making use of tags cannot rely on the > > -tag information for user virtual addresses being maintained for fields > > -inside siginfo_t. One exception to this rule is for signals raised in > > -response to watchpoint debug exceptions, where the tag information will > > -be preserved. > > +Non-zero tags are not preserved in the fault address fields > > +siginfo.si_addr or sigcontext.fault_address when delivering > > +signals. This means that signal handlers in applications making use > > +of tags cannot rely on the tag information for user virtual addresses > > +being maintained in these fields. One exception to this rule is for > > +signals raised in response to watchpoint debug exceptions, where the > > +tag information will be preserved. > > + > > +The fault address tag is preserved in the si_addr_tag_bits field > > +of siginfo, which is set for signals raised in response to data aborts > > +and instruction aborts. The si_addr_tag_bits_mask field indicates > > +which bits of the field are valid. The validity of these fields is > > +indicated by the SIXFLAG_ADDR_TAG_BITS flag in siginfo.si_xflags, > > +and the validity of si_xflags in turn is indicated by the kernel > > +indicating support for the sigaction.sa_flags flag SA_XFLAGS. > > > > The architecture prevents the use of a tagged PC, so the upper byte will > > be set to a sign-extension of bit 55 on exception return. > > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h > > index 99b9383cd036..2a8aa1884d8a 100644 > > --- a/arch/arm64/include/asm/exception.h > > +++ b/arch/arm64/include/asm/exception.h > > @@ -32,7 +32,7 @@ static inline u32 disr_to_esr(u64 disr) > > } > > > > asmlinkage void enter_from_user_mode(void); > > -void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > > +void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs); > > void do_undefinstr(struct pt_regs *regs); > > void do_bti(struct pt_regs *regs); > > asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); > > diff --git a/arch/arm64/include/asm/signal.h b/arch/arm64/include/asm/signal.h > > new file mode 100644 > > index 000000000000..46f9b3c61896 > > --- /dev/null > > +++ b/arch/arm64/include/asm/signal.h > > @@ -0,0 +1,19 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +#ifndef __ARM64_ASM_SIGNAL_H > > +#define __ARM64_ASM_SIGNAL_H > > + > > +#include <uapi/asm/signal.h> > > +#include <uapi/asm/siginfo.h> > > + > > +static inline unsigned long arch_addr_tag_bits_mask(unsigned long sig, > > + unsigned long si_code) > > +{ > > + if (sig == SIGTRAP && si_code == TRAP_BRKPT) > > + return 0; > > + if (sig == SIGSEGV && si_code == SEGV_MTESERR) > > + return 0xfUL << 56; > > Should this be 0xffUL << 56? > > I thought MTE ignored bits 63:60, rather than requiring them to be 0? Yes, but the architecture defines FAR_EL1[63:60] as UNKNOWN for tag check faults. As such the bits are masked out in do_tag_check_fault and excluded from the mask here to indicate that they are not present. > The whole tag byte may be relevant for debugging purposes, even if only > some of the bits are checked in hardware. Yes and that's why it's a bit of a shame that the bits were defined as UNKNOWN. We had an idea for how to improve error reports by using those bits to link tag check faults to previous allocations, which was precluded by the missing bits. Hopefully a future revision of the architecture will define these bits for tag check faults (at least optionally). If that ever happens and support for the architecture extension is detected we could stop masking the bits out in do_tag_check_fault and set si_addr_tag_bits_mask to 0xffUL << 56, which would let userspace know that the bits are now present. > For consistency, I wonder whether it makes sense to expose the bits as > tag bits for watchpoint execeptions, even if they are left un-cleared in > si_addr for historical reasons. I don't have a strong opinion on whether to do this or not, but it seems like a nice property that the bits are either defined in si_addr or in si_addr_tag_bits. I think we could leave the watchpoint exception on arm64 as "weird for historical reasons" and insist that any future architectures adopting tagged addresses handle the tag bits uniformly. Peter ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo 2020-11-03 3:59 ` Peter Collingbourne @ 2020-11-03 11:49 ` Dave Martin 0 siblings, 0 replies; 17+ messages in thread From: Dave Martin @ 2020-11-03 11:49 UTC (permalink / raw) To: Peter Collingbourne Cc: Catalin Marinas, Evgenii Stepanov, Kostya Serebryany, Vincenzo Frascino, Will Deacon, Oleg Nesterov, Eric W. Biederman, James E.J. Bottomley, Andrey Konovalov, Helge Deller, Kevin Brodsky, Linux API, David Spickett, Linux ARM, Richard Henderson On Mon, Nov 02, 2020 at 07:59:25PM -0800, Peter Collingbourne wrote: > On Mon, Nov 2, 2020 at 9:55 AM Dave Martin <Dave.Martin@arm.com> wrote: > > > > On Fri, Oct 16, 2020 at 05:12:33PM -0700, Peter Collingbourne wrote: > > > The kernel currently clears the tag bits (i.e. bits 56-63) in the fault > > > address exposed via siginfo.si_addr and sigcontext.fault_address. However, > > > the tag bits may be needed by tools in order to accurately diagnose > > > memory errors, such as HWASan [1] or future tools based on the Memory > > > Tagging Extension (MTE). > > > > > > We should not stop clearing these bits in the existing fault address > > > fields, because there may be existing userspace applications that are > > > expecting the tag bits to be cleared. Instead, create a new pair of > > > union fields in siginfo._sigfault, and store the tag bits of FAR_EL1 > > > there, together with a mask specifying which bits are valid. > > > > > > A flag is added to si_xflags to allow userspace to determine whether > > > the values in the fields are valid. > > > > > > [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html > > > > > > Signed-off-by: Peter Collingbourne <pcc@google.com> > > > Link: https://linux-review.googlesource.com/id/Ia8876bad8c798e0a32df7c2ce1256c4771c81446 > > > --- > > > v12: > > > - add new fields to signal_compat.c test cases > > > - rebased to 5.10-rc1 > > > - mask out bits 63:60 for tag check faults > > > > > > v11: > > > - add a comment explaining what the arch hook should do > > > - rename ignored bits to tag bits > > > > > > v10: > > > - rename the flag to SIXFLAG_ADDR_IGNORED_BITS > > > - use an arch hook to specify which bits are ignored, instead > > > of passing them explicitly > > > - while refactoring for the arch hook, noticed that my previous > > > patches missed a case involving cache maintenance instructions, > > > so expose the tag bits for that signal as well > > > > > > v9: > > > - make the ignored bits fields generic > > > - add some new dependent patches that prepare us to store the > > > field in such a way that userspace can detect their presence > > > > > > v8: > > > - rebase onto 5.8rc2 > > > > > > v7: > > > - switch to a new siginfo field instead of using sigcontext > > > - merge the patch back into one since the other patches are now > > > unnecessary > > > > > > v6: > > > - move fault address and fault code into the kernel_siginfo data structure > > > - split the patch in three since it was getting large and now has > > > generic and arch-specific parts > > > > > > v5: > > > - add padding to fault_addr_top_byte_context in order to ensure the correct > > > size and preserve sp alignment > > > > > > v4: > > > - expose only the tag bits in the context instead of the entire FAR_EL1 > > > - remove mention of the new context from the sigcontext.__reserved[] note > > > > > > v3: > > > - add documentation to tagged-pointers.rst > > > - update comments in sigcontext.h > > > > > > v2: > > > - revert changes to hw_breakpoint.c > > > - rename set_thread_esr to set_thread_far_esr > > > > > > Documentation/arm64/tagged-pointers.rst | 21 +++++--- > > > arch/arm64/include/asm/exception.h | 2 +- > > > arch/arm64/include/asm/signal.h | 19 +++++++ > > > arch/arm64/include/asm/system_misc.h | 2 +- > > > arch/arm64/include/asm/traps.h | 6 +-- > > > arch/arm64/kernel/debug-monitors.c | 5 +- > > > arch/arm64/kernel/entry-common.c | 2 - > > > arch/arm64/kernel/ptrace.c | 7 +-- > > > arch/arm64/kernel/sys_compat.c | 5 +- > > > arch/arm64/kernel/traps.c | 29 ++++++----- > > > arch/arm64/mm/fault.c | 68 ++++++++++++++----------- > > > arch/x86/kernel/signal_compat.c | 9 +++- > > > include/linux/compat.h | 2 + > > > include/linux/signal.h | 16 ++++++ > > > include/uapi/asm-generic/siginfo.h | 10 ++++ > > > kernel/signal.c | 18 ++++++- > > > 16 files changed, 148 insertions(+), 73 deletions(-) > > > create mode 100644 arch/arm64/include/asm/signal.h > > > > > > diff --git a/Documentation/arm64/tagged-pointers.rst b/Documentation/arm64/tagged-pointers.rst > > > index eab4323609b9..032c09a876f4 100644 > > > --- a/Documentation/arm64/tagged-pointers.rst > > > +++ b/Documentation/arm64/tagged-pointers.rst > > > @@ -53,12 +53,21 @@ visibility. > > > Preserving tags > > > --------------- > > > > > > -Non-zero tags are not preserved when delivering signals. This means that > > > -signal handlers in applications making use of tags cannot rely on the > > > -tag information for user virtual addresses being maintained for fields > > > -inside siginfo_t. One exception to this rule is for signals raised in > > > -response to watchpoint debug exceptions, where the tag information will > > > -be preserved. > > > +Non-zero tags are not preserved in the fault address fields > > > +siginfo.si_addr or sigcontext.fault_address when delivering > > > +signals. This means that signal handlers in applications making use > > > +of tags cannot rely on the tag information for user virtual addresses > > > +being maintained in these fields. One exception to this rule is for > > > +signals raised in response to watchpoint debug exceptions, where the > > > +tag information will be preserved. > > > + > > > +The fault address tag is preserved in the si_addr_tag_bits field > > > +of siginfo, which is set for signals raised in response to data aborts > > > +and instruction aborts. The si_addr_tag_bits_mask field indicates > > > +which bits of the field are valid. The validity of these fields is > > > +indicated by the SIXFLAG_ADDR_TAG_BITS flag in siginfo.si_xflags, > > > +and the validity of si_xflags in turn is indicated by the kernel > > > +indicating support for the sigaction.sa_flags flag SA_XFLAGS. > > > > > > The architecture prevents the use of a tagged PC, so the upper byte will > > > be set to a sign-extension of bit 55 on exception return. > > > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h > > > index 99b9383cd036..2a8aa1884d8a 100644 > > > --- a/arch/arm64/include/asm/exception.h > > > +++ b/arch/arm64/include/asm/exception.h > > > @@ -32,7 +32,7 @@ static inline u32 disr_to_esr(u64 disr) > > > } > > > > > > asmlinkage void enter_from_user_mode(void); > > > -void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs); > > > +void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs); > > > void do_undefinstr(struct pt_regs *regs); > > > void do_bti(struct pt_regs *regs); > > > asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr); > > > diff --git a/arch/arm64/include/asm/signal.h b/arch/arm64/include/asm/signal.h > > > new file mode 100644 > > > index 000000000000..46f9b3c61896 > > > --- /dev/null > > > +++ b/arch/arm64/include/asm/signal.h > > > @@ -0,0 +1,19 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > +#ifndef __ARM64_ASM_SIGNAL_H > > > +#define __ARM64_ASM_SIGNAL_H > > > + > > > +#include <uapi/asm/signal.h> > > > +#include <uapi/asm/siginfo.h> > > > + > > > +static inline unsigned long arch_addr_tag_bits_mask(unsigned long sig, > > > + unsigned long si_code) > > > +{ > > > + if (sig == SIGTRAP && si_code == TRAP_BRKPT) > > > + return 0; > > > + if (sig == SIGSEGV && si_code == SEGV_MTESERR) > > > + return 0xfUL << 56; > > > > Should this be 0xffUL << 56? > > > > I thought MTE ignored bits 63:60, rather than requiring them to be 0? > > Yes, but the architecture defines FAR_EL1[63:60] as UNKNOWN for tag > check faults. As such the bits are masked out in do_tag_check_fault > and excluded from the mask here to indicate that they are not present. Ah, OK. I'd forgotten that. So long as these bits are also zeroed in si_addr, I guess that's fine. > > > The whole tag byte may be relevant for debugging purposes, even if only > > some of the bits are checked in hardware. > > Yes and that's why it's a bit of a shame that the bits were defined as > UNKNOWN. We had an idea for how to improve error reports by using > those bits to link tag check faults to previous allocations, which was > precluded by the missing bits. Presumably if some future arch version propagated this information, we could add those bits into the tag bits mask when running on new enough hardware? Either way, I think we could do with a comment here. > > Hopefully a future revision of the architecture will define these bits > for tag check faults (at least optionally). If that ever happens and > support for the architecture extension is detected we could stop > masking the bits out in do_tag_check_fault and set > si_addr_tag_bits_mask to 0xffUL << 56, which would let userspace know > that the bits are now present. > > > For consistency, I wonder whether it makes sense to expose the bits as > > tag bits for watchpoint execeptions, even if they are left un-cleared in > > si_addr for historical reasons. > > I don't have a strong opinion on whether to do this or not, but it > seems like a nice property that the bits are either defined in si_addr > or in si_addr_tag_bits. I think we could leave the watchpoint > exception on arm64 as "weird for historical reasons" and insist that > any future architectures adopting tagged addresses handle the tag bits > uniformly. Ack -- I guess I don't have a strong opinion either. There's a risk of inventing problems here in order to solve them, so I agree we should keep things as simple and follow your current design. Cheers ---Dave ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-11-03 11:50 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-10-17 0:12 [PATCH v12 0/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 1/8] parisc: Drop parisc special case for __sighandler_t Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 2/8] parisc: start using signal-defs.h Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 3/8] arch: move SA_* definitions to generic headers Peter Collingbourne 2020-11-02 17:23 ` Dave Martin 2020-10-17 0:12 ` [PATCH v12 4/8] signal: clear non-uapi flag bits when passing/returning sa_flags Peter Collingbourne 2020-11-02 17:26 ` Dave Martin 2020-10-17 0:12 ` [PATCH v12 5/8] signal: define the SA_UNSUPPORTED bit in sa_flags Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 6/8] signal: deduplicate code dealing with common _sigfault fields Peter Collingbourne 2020-10-17 0:12 ` [PATCH v12 7/8] signal: define the field siginfo.si_xflags Peter Collingbourne 2020-11-02 17:37 ` Dave Martin 2020-11-03 4:10 ` Peter Collingbourne 2020-11-03 11:44 ` Dave Martin 2020-10-17 0:12 ` [PATCH v12 8/8] arm64: expose FAR_EL1 tag bits in siginfo Peter Collingbourne 2020-11-02 17:54 ` Dave Martin 2020-11-03 3:59 ` Peter Collingbourne 2020-11-03 11:49 ` Dave Martin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).