From: Chang S. Bae <hidden> Date: 2021-03-16 06:57:46
During signal entry, the kernel pushes data onto the normal userspace
stack. On x86, the data pushed onto the user stack includes XSAVE state,
which has grown over time as new features and larger registers have been
added to the architecture.
MINSIGSTKSZ is a constant provided in the kernel signal.h headers and
typically distributed in lib-dev(el) packages, e.g. [1]. Its value is
compiled into programs and is part of the user/kernel ABI. The MINSIGSTKSZ
constant indicates to userspace how much data the kernel expects to push on
the user stack, [2][3].
However, this constant is much too small and does not reflect recent
additions to the architecture. For instance, when AVX-512 states are in
use, the signal frame size can be 3.5KB while MINSIGSTKSZ remains 2KB.
The bug report [4] explains this as an ABI issue. The small MINSIGSTKSZ can
cause user stack overflow when delivering a signal.
In this series, we suggest a couple of things:
1. Provide a variable minimum stack size to userspace, as a similar
approach to [5].
2. Avoid using a too-small alternate stack.
Changes from v6 [11]:
* Updated and fixed the documentation. (Borislav Petkov)
* Revised the AT_MINSIGSTKSZ comment. (Borislav Petkov)
Changes form v5 [10]:
* Fixed the overflow detection. (Andy Lutomirski)
* Reverted the AT_MINSIGSTKSZ removal on arm64. (Dave Martin)
* Added a documentation about the x86 AT_MINSIGSTKSZ.
* Supported the existing sigaltstack test to use the new aux vector.
Changes from v4 [9]:
* Moved the aux vector define to the generic header. (Carlos O'Donell)
Changes from v3 [8]:
* Updated the changelog. (Borislav Petkov)
* Revised the test messages again. (Borislav Petkov)
Changes from v2 [7]:
* Simplified the sigaltstack overflow prevention. (Jann Horn)
* Renamed fpstate size helper with cleanup. (Borislav Petkov)
* Cleaned up the signframe struct size defines. (Borislav Petkov)
* Revised the selftest messages. (Borislav Petkov)
* Revised a changelog. (Borislav Petkov)
Changes from v1 [6]:
* Took stack alignment into account for sigframe size. (Dave Martin)
[1]: https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/bits/sigstack.h;h=b9dca794da093dc4d41d39db9851d444e1b54d9b;hb=HEAD
[2]: https://www.gnu.org/software/libc/manual/html_node/Signal-Stack.html
[3]: https://man7.org/linux/man-pages/man2/sigaltstack.2.html
[4]: https://bugzilla.kernel.org/show_bug.cgi?id=153531
[5]: https://blog.linuxplumbersconf.org/2017/ocw/system/presentations/4671/original/plumbers-dm-2017.pdf
[6]: https://lore.kernel.org/lkml/20200929205746.6763-1-chang.seok.bae@intel.com/
[7]: https://lore.kernel.org/lkml/20201119190237.626-1-chang.seok.bae@intel.com/
[8]: https://lore.kernel.org/lkml/20201223015312.4882-1-chang.seok.bae@intel.com/
[9]: https://lore.kernel.org/lkml/20210115211038.2072-1-chang.seok.bae@intel.com/
[10]: https://lore.kernel.org/lkml/20210203172242.29644-1-chang.seok.bae@intel.com/
[11]: https://lore.kernel.org/lkml/20210227165911.32757-1-chang.seok.bae@intel.com/
Chang S. Bae (6):
uapi: Define the aux vector AT_MINSIGSTKSZ
x86/signal: Introduce helpers to get the maximum signal frame size
x86/elf: Support a new ELF aux vector AT_MINSIGSTKSZ
selftest/sigaltstack: Use the AT_MINSIGSTKSZ aux vector if available
x86/signal: Detect and prevent an alternate signal stack overflow
selftest/x86/signal: Include test cases for validating sigaltstack
Documentation/x86/elf_auxvec.rst | 53 +++++++++
Documentation/x86/index.rst | 1 +
arch/x86/include/asm/elf.h | 4 +
arch/x86/include/asm/fpu/signal.h | 2 +
arch/x86/include/asm/sigframe.h | 2 +
arch/x86/include/uapi/asm/auxvec.h | 4 +-
arch/x86/kernel/cpu/common.c | 3 +
arch/x86/kernel/fpu/signal.c | 19 ++++
arch/x86/kernel/signal.c | 72 +++++++++++-
include/uapi/linux/auxvec.h | 3 +
tools/testing/selftests/sigaltstack/sas.c | 20 +++-
tools/testing/selftests/x86/Makefile | 2 +-
tools/testing/selftests/x86/sigaltstack.c | 128 ++++++++++++++++++++++
13 files changed, 300 insertions(+), 13 deletions(-)
create mode 100644 Documentation/x86/elf_auxvec.rst
create mode 100644 tools/testing/selftests/x86/sigaltstack.c
base-commit: 1e28eed17697bcf343c6743f0028cc3b5dd88bf0
--
2.17.1
From: Chang S. Bae <hidden> Date: 2021-03-16 06:57:46
Define the AT_MINSIGSTKSZ in generic Linux. It is already used as generic
ABI in glibc's generic elf.h, and this define will prevent future namespace
conflicts. In particular, x86 is also using this generic definition.
Signed-off-by: Chang S. Bae <redacted>
Reviewed-by: Len Brown <redacted>
Cc: Carlos O'Donell <redacted>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: libc-alpha@sourceware.org
Cc: linux-arch@vger.kernel.org
Cc: linux-api@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
Change from v6:
* Revised the comment. (Borislav Petkov)
Change from v5:
* Reverted the arm64 change. (Dave Martin and Will Deacon)
* Massaged the changelog.
Change from v4:
* Added as a new patch (Carlos O'Donell)
---
include/uapi/linux/auxvec.h | 3 +++
1 file changed, 3 insertions(+)
From: Chang S. Bae <hidden> Date: 2021-03-16 06:58:19
Signal frames do not have a fixed format and can vary in size when a number
of things change: support XSAVE features, 32 vs. 64-bit apps. Add the code
to support a runtime method for userspace to dynamically discover how large
a signal stack needs to be.
Introduce a new variable, max_frame_size, and helper functions for the
calculation to be used in a new user interface. Set max_frame_size to a
system-wide worst-case value, instead of storing multiple app-specific
values.
Signed-off-by: Chang S. Bae <redacted>
Reviewed-by: Len Brown <redacted>
Acked-by: H.J. Lu <redacted>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
---
Changes from v2:
* Renamed the fpstate size helper with cleanup (Borislav Petkov)
* Moved the sigframe struct size defines to where used (Borislav Petkov)
* Removed unneeded sentence in the changelog (Borislav Petkov)
Change from v1:
* Took stack alignment into account for sigframe size (Dave Martin)
---
arch/x86/include/asm/fpu/signal.h | 2 ++
arch/x86/include/asm/sigframe.h | 2 ++
arch/x86/kernel/cpu/common.c | 3 ++
arch/x86/kernel/fpu/signal.c | 19 +++++++++++
arch/x86/kernel/signal.c | 57 +++++++++++++++++++++++++++++--
5 files changed, 81 insertions(+), 2 deletions(-)
@@ -507,6 +507,25 @@ fpu__alloc_mathframe(unsigned long sp, int ia32_frame,returnsp;}++unsignedlongfpu__get_fpstate_size(void)+{+unsignedlongret=xstate_sigframe_size();++/*+*Thisspaceisneededon(most)32-bitkernels,orwhena32-bit+*appisrunningona64-bitkernel.Tokeepthingssimple,just+*assumetheworstcaseandalwaysincludespacefor'freg_state',+*evenfor64-bitappson64-bitkernels.Thiswastesabitof+*space,butkeepsthecodesimple.+*/+if((IS_ENABLED(CONFIG_IA32_EMULATION)||+IS_ENABLED(CONFIG_X86_32))&&use_fxsr())+ret+=sizeof(structfregs_state);++returnret;+}+/**PreparetheSWreservedportionofthefxsavememorylayout,indicating*thepresenceoftheextendedstateinformationinthememorylayout
From: Chang S. Bae <hidden> Date: 2021-03-16 06:58:19
The kernel pushes context on to the userspace stack to prepare for the
user's signal handler. When the user has supplied an alternate signal
stack, via sigaltstack(2), it is easy for the kernel to verify that the
stack size is sufficient for the current hardware context.
Check if writing the hardware context to the alternate stack will exceed
it's size. If yes, then instead of corrupting user-data and proceeding with
the original signal handler, an immediate SIGSEGV signal is delivered.
Instead of calling on_sig_stack(), directly check the new stack pointer
whether in the bounds.
While the kernel allows new source code to discover and use a sufficient
alternate signal stack size, this check is still necessary to protect
binaries with insufficient alternate signal stack size from data
corruption.
Suggested-by: Jann Horn <jannh@google.com>
Signed-off-by: Chang S. Bae <redacted>
Reviewed-by: Len Brown <redacted>
Reviewed-by: Jann Horn <jannh@google.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Jann Horn <jannh@google.com>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
---
Changes from v5:
* Fixed the overflow check. (Andy Lutomirski)
* Updated the changelog.
Changes from v3:
* Updated the changelog (Borislav Petkov)
Changes from v2:
* Simplified the implementation (Jann Horn)
---
arch/x86/kernel/signal.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
@@ -251,8 +251,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,/* This is the X/Open sanctioned signal stack switching. */if(ka->sa.sa_flags&SA_ONSTACK){-if(sas_ss_flags(sp)==0)+if(sas_ss_flags(sp)==0){sp=current->sas_ss_sp+current->sas_ss_size;+/* On the alternate signal stack */+onsigstack=true;+}}elseif(IS_ENABLED(CONFIG_X86_32)&&!onsigstack&®s->ss!=__USER_DS&&
@@ -272,7 +275,8 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,*Ifweareonthealternatesignalstackandwouldoverflowit,don't.*Returnanalways-bogusaddressinsteadsowewilldiewithSIGSEGV.*/-if(onsigstack&&!likely(on_sig_stack(sp)))+if(onsigstack&&unlikely(sp<=current->sas_ss_sp||+sp-current->sas_ss_sp>current->sas_ss_size))return(void__user*)-1L;/* save i387 and extended state */
On Mon, Mar 15, 2021 at 11:52:14PM -0700, Chang S. Bae wrote:
quoted hunk
@@ -272,7 +275,8 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, * If we are on the alternate signal stack and would overflow it, don't. * Return an always-bogus address instead so we will die with SIGSEGV. */- if (onsigstack && !likely(on_sig_stack(sp)))+ if (onsigstack && unlikely(sp <= current->sas_ss_sp ||+ sp - current->sas_ss_sp > current->sas_ss_size)) return (void __user *)-1L;
So clearly I'm missing something because trying to trigger the test case
in the bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=153531
on current tip/master doesn't work. Runs with MY_MINSIGSTKSZ under 2048
fail with:
tst-minsigstksz-2: sigaltstack: Cannot allocate memory
and above 2048 don't overwrite bytes below the stack.
So something else is missing. How did you test this patch?
Thx.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
* If we are on the alternate signal stack and would overflow it, don't.
* Return an always-bogus address instead so we will die with SIGSEGV.
*/
- if (onsigstack && !likely(on_sig_stack(sp)))
+ if (onsigstack && unlikely(sp <= current->sas_ss_sp ||
+ sp - current->sas_ss_sp > current->sas_ss_size))
return (void __user *)-1L;
So clearly I'm missing something because trying to trigger the test case
in the bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=153531
on current tip/master doesn't work. Runs with MY_MINSIGSTKSZ under 2048
fail with:
tst-minsigstksz-2: sigaltstack: Cannot allocate memory
and above 2048 don't overwrite bytes below the stack.
So something else is missing. How did you test this patch?
I suspect the AVX-512 states not enabled there.
When I ran it under a machine without AVX-512 like this, it didn’t show the
overwrite message:
$ cat /proc/cpuinfo | grep -m1 "model name”
model name : Intel(R) Core(TM) i9-10900K CPU @ 3.70GHz
$ sudo dmesg | grep "Enabled xstate”
[ 0.000000] x86/fpu: Enabled xstate features 0x1f, context size is 960
bytes, using ‘compacted’ format.
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=2047
$ ./a.out
a.out: sigaltstack: Cannot allocate memory
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=2048
$ ./a.out
When do it again with AVX-512, it did show the message:
$ cat /proc/cpuinfo | grep -m1 "model name”
model name : Intel(R) Core(TM) i9-7940X CPU @ 3.10GHz
$ sudo dmesg | grep "Enabled xstate”
[ 0.000000] x86/fpu: Enabled xstate features 0xff, context size is 2560
bytes, using 'compacted' format.
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=2048
$ ./a.out
a.out: changed byte 1412 bytes below configured stack
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=3490
$ ./a.out
a.out: changed byte 21 bytes below configured stack
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=3491
$ ./a.out
Also, on the second machine, without this patch:
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=3191
$ ./a.out
a.out: changed byte 319 bytes below configured stack
But with this patch, it gave segfault with a too-small size:
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=3191
$ ./a.out
Segmentation fault (core dumped)
Thanks,
Chang
@@ -246,8 +246,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,/* This is the X/Open sanctioned signal stack switching. */if(ka->sa.sa_flags&SA_ONSTACK){-if(sas_ss_flags(sp)==0)+if(sas_ss_flags(sp)==0){sp=current->sas_ss_sp+current->sas_ss_size;+/* On the alternate signal stack */+onsigstack=true;+}}elseif(IS_ENABLED(CONFIG_X86_32)&&!onsigstack&®s->ss!=__USER_DS&&
@@ -263,11 +266,16 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,sp=align_sigframe(sp-frame_size);+if(onsigstack)+pr_info("%s: sp: 0x%lx, sas_ss_sp: 0x%lx, sas_ss_size 0x%lx\n",+__func__,sp,current->sas_ss_sp,current->sas_ss_size);+/**Ifweareonthealternatesignalstackandwouldoverflowit,don't.*Returnanalways-bogusaddressinsteadsowewilldiewithSIGSEGV.*/-if(onsigstack&&!likely(on_sig_stack(sp)))+if(onsigstack&&unlikely(sp<=current->sas_ss_sp||+sp-current->sas_ss_sp>current->sas_ss_size))return(void__user*)-1L;/* save i387 and extended state */
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
On Mar 25, 2021, at 09:20, Borislav Petkov [off-list ref] wrote:
$ gcc tst-minsigstksz-2.c -DMY_MINSIGSTKSZ=3453 -o tst-minsigstksz-2
$ ./tst-minsigstksz-2
tst-minsigstksz-2: changed byte 50 bytes below configured stack
Whoops.
And the debug print said:
[ 5395.252884] signal: get_sigframe: sp: 0x7f54ec39e7b8, sas_ss_sp: 0x7f54ec39e6ce, sas_ss_size 0xd7d
which tells me that, AFAICT, your check whether we have enough alt stack
doesn't seem to work in this case.
Yes, in this case.
tst-minsigstksz-2.c has this code:
static void
handler (int signo)
{
/* Clear a bit of on-stack memory. */
volatile char buffer[256];
for (size_t i = 0; i < sizeof (buffer); ++i)
buffer[i] = 0;
handler_run = 1;
}
…
if (handler_run != 1)
errx (1, "handler did not run");
for (void *p = stack_buffer; p < stack_bottom; ++p)
if (*(unsigned char *) p != 0xCC)
errx (1, "changed byte %zd bytes below configured stack\n",
stack_bottom - p);
…
I think the message comes from the handler’s overwriting, not from the kernel.
The patch's check is to detect and prevent the kernel-induced overflow --
whether alt stack enough for signal delivery itself. The stack is possibly
not enough for the signal handler's use as the kernel does not know for it.
Thanks,
Chang
From: Andy Lutomirski <luto@kernel.org> Date: 2021-03-25 18:14:43
On Mon, Mar 15, 2021 at 11:57 PM Chang S. Bae [off-list ref] wrote:
The kernel pushes context on to the userspace stack to prepare for the
user's signal handler. When the user has supplied an alternate signal
stack, via sigaltstack(2), it is easy for the kernel to verify that the
stack size is sufficient for the current hardware context.
Check if writing the hardware context to the alternate stack will exceed
it's size. If yes, then instead of corrupting user-data and proceeding with
the original signal handler, an immediate SIGSEGV signal is delivered.
Instead of calling on_sig_stack(), directly check the new stack pointer
whether in the bounds.
While the kernel allows new source code to discover and use a sufficient
alternate signal stack size, this check is still necessary to protect
binaries with insufficient alternate signal stack size from data
corruption.
This patch results in excessively complicated control and data flow.
- int onsigstack = on_sig_stack(sp);
+ bool onsigstack = on_sig_stack(sp);
Here onsigstack means "we were already using the altstack".
quoted hunk
int ret;
/* redzone */
@@ -251,8 +251,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, /* This is the X/Open sanctioned signal stack switching. */ if (ka->sa.sa_flags & SA_ONSTACK) {- if (sas_ss_flags(sp) == 0)+ if (sas_ss_flags(sp) == 0) { sp = current->sas_ss_sp + current->sas_ss_size;+ /* On the alternate signal stack */+ onsigstack = true;+ }
But now onsigstack is also true if we are using the legacy path to
*enter* the altstack. So now it's (was on altstack) || (entering
altstack via legacy path).
@@ -272,7 +275,8 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, * If we are on the alternate signal stack and would overflow it, don't. * Return an always-bogus address instead so we will die with SIGSEGV. */- if (onsigstack && !likely(on_sig_stack(sp)))+ if (onsigstack && unlikely(sp <= current->sas_ss_sp ||+ sp - current->sas_ss_sp > current->sas_ss_size))
And now we fail if ((was on altstack) || (entering altstack via legacy
path)) && (new sp is out of bounds).
The condition we actually want is that, if we are entering the
altstack and we don't fit, we should fail. This is tricky because of
the autodisarm stuff and the possibility of nonlinear stack segments,
so it's not even clear to me exactly what we should be doing. I
propose:
return (void __user *)-1L;
Can we please log something (if (show_unhandled_signals ||
printk_ratelimit()) that says that we overflowed the altstack?
How about:
pt_regs *regs, size_t frame_size,
* If we are on the alternate signal stack and would overflow it, don't.
* Return an always-bogus address instead so we will die with SIGSEGV.
*/
- if (onsigstack && !likely(on_sig_stack(sp)))
+ if (unlikely(entering_altstack &&
+ (sp <= current->sas_ss_sp ||
+ sp - current->sas_ss_sp > current->sas_ss_size))) {
+ if (show_unhandled_signals && printk_ratelimit()) {
+ pr_info("%s[%d] overflowed sigaltstack",
+ tsk->comm, task_pid_nr(tsk));
+ }
+
return (void __user *)-1L;
+ }
/* save i387 and extended state */
ret = copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size);
Apologies for whitespace damage. I attached it, too.
@@ -246,15 +247,25 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,/* This is the X/Open sanctioned signal stack switching. */if(ka->sa.sa_flags&SA_ONSTACK){-if(sas_ss_flags(sp)==0)+/*+*Thischecksalready_onsigstackviasas_ss_flags().+*SensibleprogramsuseSS_AUTODISARM,whichdisables+*thatcheck,andprogramsthatdon'tuse+*SS_AUTODISARMgetcompatiblebutpotentially+*bizarrebehavior.+*/+if(sas_ss_flags(sp)==0){sp=current->sas_ss_sp+current->sas_ss_size;+entering_altstack=true;+}}elseif(IS_ENABLED(CONFIG_X86_32)&&-!onsigstack&&+!already_onsigstack&®s->ss!=__USER_DS&&!(ka->sa.sa_flags&SA_RESTORER)&&ka->sa.sa_restorer){/* This is the legacy signal stack switching. */sp=(unsignedlong)ka->sa.sa_restorer;+entering_altstack=true;}
What a mess this whole signal handling is. I need a course in signal
handling to understand what's going on here...
@@ -267,8 +278,16 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, * If we are on the alternate signal stack and would overflow it, don't. * Return an always-bogus address instead so we will die with SIGSEGV. */- if (onsigstack && !likely(on_sig_stack(sp)))+ if (unlikely(entering_altstack &&+ (sp <= current->sas_ss_sp ||+ sp - current->sas_ss_sp > current->sas_ss_size))) {
You could've simply done
if (unlikely(entering_altstack && !on_sig_stack(sp)))
here.
Why do you even wanna issue that? It looks like callers will propagate
an error value up and people don't look at dmesg all the time.
Btw, s/tsk/current/g
IOW, this builds:
---
@@ -234,10 +234,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,void__user**fpstate){/* Default to using normal stack */+boolalready_onsigstack=on_sig_stack(regs->sp);+boolentering_altstack=false;unsignedlongmath_size=0;unsignedlongsp=regs->sp;unsignedlongbuf_fx=0;-intonsigstack=on_sig_stack(sp);intret;/* redzone */
@@ -246,15 +247,24 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,/* This is the X/Open sanctioned signal stack switching. */if(ka->sa.sa_flags&SA_ONSTACK){-if(sas_ss_flags(sp)==0)+/*+*Thischecksalready_onsigstackviasas_ss_flags().Sensible+*programsuseSS_AUTODISARM,whichdisablesthatcheck,and+*programsthatdon'tuseSS_AUTODISARMgetcompatiblebut+*potentiallybizarrebehavior.+*/+if(sas_ss_flags(sp)==0){sp=current->sas_ss_sp+current->sas_ss_size;+entering_altstack=true;+}}elseif(IS_ENABLED(CONFIG_X86_32)&&-!onsigstack&&+!already_onsigstack&®s->ss!=__USER_DS&&!(ka->sa.sa_flags&SA_RESTORER)&&ka->sa.sa_restorer){/* This is the legacy signal stack switching. */sp=(unsignedlong)ka->sa.sa_restorer;+entering_altstack=true;}sp=fpu__alloc_mathframe(sp,IS_ENABLED(CONFIG_X86_32),
@@ -267,8 +277,14 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,*Ifweareonthealternatesignalstackandwouldoverflowit,don't.*Returnanalways-bogusaddressinsteadsowewilldiewithSIGSEGV.*/-if(onsigstack&&!likely(on_sig_stack(sp)))+if(unlikely(entering_altstack&&!on_sig_stack(sp))){++if(show_unhandled_signals&&printk_ratelimit())+pr_info("%s[%d] overflowed sigaltstack",+current->comm,task_pid_nr(current));+return(void__user*)-1L;+}/* save i387 and extended state */ret=copy_fpstate_to_sigframe(*fpstate,(void__user*)buf_fx,math_size);
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
* If we are on the alternate signal stack and would overflow it, don't.
* Return an always-bogus address instead so we will die with SIGSEGV.
*/
- if (onsigstack && !likely(on_sig_stack(sp)))
+ if (unlikely(entering_altstack &&
+ (sp <= current->sas_ss_sp ||
+ sp - current->sas_ss_sp > current->sas_ss_size))) {
You could've simply done
if (unlikely(entering_altstack && !on_sig_stack(sp)))
here.
On Thu, Mar 25, 2021 at 09:11:56PM +0000, Bae, Chang Seok wrote:
But if sigaltstack()’ed with the SS_AUTODISARM flag, both on_sig_stack() and
sas_ss_flags() return 0 [1]. Then, segfault always here. v5 had the exact
issue before [2].
Ah, there's that SS_AUTODISARM check above it which I missed, sorry.
I guess we can do a __on_sig_stack() helper or so which does the stack
check only without the SS_AUTODISARM. Just for readability's sake in
what is already a pretty messy function.
Thx.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
@@ -246,15 +247,25 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,/* This is the X/Open sanctioned signal stack switching. */if(ka->sa.sa_flags&SA_ONSTACK){-if(sas_ss_flags(sp)==0)+/*+*Thischecksalready_onsigstackviasas_ss_flags().+*SensibleprogramsuseSS_AUTODISARM,whichdisables+*thatcheck,andprogramsthatdon'tuse+*SS_AUTODISARMgetcompatiblebutpotentially+*bizarrebehavior.+*/+if(sas_ss_flags(sp)==0){sp=current->sas_ss_sp+current->sas_ss_size;+entering_altstack=true;+}}elseif(IS_ENABLED(CONFIG_X86_32)&&-!onsigstack&&+!already_onsigstack&®s->ss!=__USER_DS&&!(ka->sa.sa_flags&SA_RESTORER)&&ka->sa.sa_restorer){/* This is the legacy signal stack switching. */sp=(unsignedlong)ka->sa.sa_restorer;+entering_altstack=true;}
What a mess this whole signal handling is. I need a course in signal
handling to understand what's going on here...
@@ -267,8 +278,16 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, * If we are on the alternate signal stack and would overflow it, don't. * Return an always-bogus address instead so we will die with SIGSEGV. */- if (onsigstack && !likely(on_sig_stack(sp)))+ if (unlikely(entering_altstack &&+ (sp <= current->sas_ss_sp ||+ sp - current->sas_ss_sp > current->sas_ss_size))) {
You could've simply done
if (unlikely(entering_altstack && !on_sig_stack(sp)))
here.
Nope. on_sig_stack() is a horrible kludge and won't work here. We
could have something like __on_sig_stack() or sp_is_on_sig_stack() or
something, though.
Why do you even wanna issue that? It looks like callers will propagate
an error value up and people don't look at dmesg all the time.
I figure that the people whose programs spontaneously crash should get
a hint why if they look at dmesg. Maybe the message should say
"overflowed sigaltstack -- try noavx512"?
We really ought to have a SIGSIGFAIL signal that's sent, double-fault
style, when we fail to send a signal.
On Thu, Mar 25, 2021 at 09:56:53PM -0700, Andy Lutomirski wrote:
Nope. on_sig_stack() is a horrible kludge and won't work here. We
could have something like __on_sig_stack() or sp_is_on_sig_stack() or
something, though.
Yeah, see my other reply. Ack to either of those carved out helpers.
I figure that the people whose programs spontaneously crash should get
a hint why if they look at dmesg. Maybe the message should say
"overflowed sigaltstack -- try noavx512"?
I guess, as long as it is ratelimited. I mean, we can remove it later if
it starts gettin' annoying.
We really ought to have a SIGSIGFAIL signal that's sent, double-fault
style, when we fail to send a signal.
On Mar 26, 2021, at 03:30, Borislav Petkov [off-list ref] wrote:
On Thu, Mar 25, 2021 at 09:56:53PM -0700, Andy Lutomirski wrote:
quoted
We really ought to have a SIGSIGFAIL signal that's sent, double-fault
style, when we fail to send a signal.
Yeap, we should be able to tell userspace that we couldn't send a
signal, hohumm.
Hi Boris,
Let me clarify some details as preparing to include this in a revision.
So, IIUC, a number needs to be assigned for this new SIGFAIL. At a glance, not
sure which one to pick there in signal.h -- 1-31 fully occupied and the rest
for 33 different real-time signals.
Also, perhaps, force_sig(SIGFAIL) here, instead of return -1 -- to die with
SIGSEGV.
Thanks,
Chang
On Mon, Apr 12, 2021 at 10:30:23PM +0000, Bae, Chang Seok wrote:
On Mar 26, 2021, at 03:30, Borislav Petkov [off-list ref] wrote:
quoted
On Thu, Mar 25, 2021 at 09:56:53PM -0700, Andy Lutomirski wrote:
quoted
We really ought to have a SIGSIGFAIL signal that's sent, double-fault
style, when we fail to send a signal.
Yeap, we should be able to tell userspace that we couldn't send a
signal, hohumm.
Hi Boris,
Let me clarify some details as preparing to include this in a revision.
So, IIUC, a number needs to be assigned for this new SIGFAIL. At a glance, not
sure which one to pick there in signal.h -- 1-31 fully occupied and the rest
for 33 different real-time signals.
Also, perhaps, force_sig(SIGFAIL) here, instead of return -1 -- to die with
SIGSEGV.
From: Chang S. Bae <hidden> Date: 2021-03-16 06:58:20
Historically, signal.h defines MINSIGSTKSZ (2KB) and SIGSTKSZ (8KB), for
use by all architectures with sigaltstack(2). Over time, the hardware state
size grew, but these constants did not evolve. Today, literal use of these
constants on several architectures may result in signal stack overflow, and
thus user data corruption.
A few years ago, the ARM team addressed this issue by establishing
getauxval(AT_MINSIGSTKSZ). This enables the kernel to supply at runtime
value that is an appropriate replacement on the current and future
hardware.
Add getauxval(AT_MINSIGSTKSZ) support to x86, analogous to the support
added for ARM in commit 94b07c1f8c39 ("arm64: signal: Report signal frame
size to userspace via auxv").
Also, include a documentation to describe x86-specific auxiliary vectors.
Reported-by: Florian Weimer <redacted>
Fixes: c2bc11f10a39 ("x86, AVX-512: Enable AVX-512 States Context Switch")
Signed-off-by: Chang S. Bae <redacted>
Reviewed-by: Len Brown <redacted>
Cc: H.J. Lu <redacted>
Cc: Fenghua Yu <redacted>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: x86@kernel.org
Cc: libc-alpha@sourceware.org
Cc: linux-arch@vger.kernel.org
Cc: linux-api@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Link: https://bugzilla.kernel.org/show_bug.cgi?id=153531
---
Changes from v6:
* Revised the documentation and fixed the build issue. (Borislav Petkov)
* Fixed the vertical alignment of '\'. (Borislav Petkov)
Changes from v5:
* Added a documentation.
---
Documentation/x86/elf_auxvec.rst | 53 ++++++++++++++++++++++++++++++
Documentation/x86/index.rst | 1 +
arch/x86/include/asm/elf.h | 4 +++
arch/x86/include/uapi/asm/auxvec.h | 4 +--
arch/x86/kernel/signal.c | 5 +++
5 files changed, 65 insertions(+), 2 deletions(-)
create mode 100644 Documentation/x86/elf_auxvec.rst
@@ -0,0 +1,53 @@+.. SPDX-License-Identifier: GPL-2.0++==================================+x86-specific ELF Auxiliary Vectors+==================================++This document describes the semantics of the x86 auxiliary vectors.++Introduction+============++ELF Auxiliary vectors enable the kernel to efficiently provide+configuration specific parameters to userspace. In this example, a program+allocates an alternate stack based on the kernel-provided size::++ #include <sys/auxv.h>+ #include <elf.h>+ #include <signal.h>+ #include <stdlib.h>+ #include <assert.h>+ #include <err.h>++ #ifndef AT_MINSIGSTKSZ+ #define AT_MINSIGSTKSZ 51+ #endif++ ....+ stack_t ss;++ ss.ss_sp = malloc(ss.ss_size);+ assert(ss.ss_sp);++ ss.ss_size = getauxval(AT_MINSIGSTKSZ) + SIGSTKSZ;+ ss.ss_flags = 0;++ if (sigaltstack(&ss, NULL))+ err(1, "sigaltstack");+++The exposed auxiliary vectors+=============================++AT_SYSINFO is used for locating the vsyscall entry point. It is not+exported on 64-bit mode.++AT_SYSINFO_EHDR is the start address of the page containing the vDSO.++AT_MINSIGSTKSZ denotes the minimum stack size required by the kernel to+deliver a signal to user-space. AT_MINSIGSTKSZ comprehends the space+consumed by the kernel to accommodate the user context for the current+hardware configuration. It does not comprehend subsequent user-space stack+consumption, which must be added by the user. (e.g. Above, user-space adds+SIGSTKSZ to AT_MINSIGSTKSZ.)
@@ -312,6 +312,7 @@ do { \NEW_AUX_ENT(AT_SYSINFO,VDSO_ENTRY);\NEW_AUX_ENT(AT_SYSINFO_EHDR,VDSO_CURRENT_BASE);\}\+NEW_AUX_ENT(AT_MINSIGSTKSZ,get_sigframe_size());\}while(0)/*
@@ -328,6 +329,7 @@ extern unsigned long task_size_32bit(void);externunsignedlongtask_size_64bit(intfull_addr_space);externunsignedlongget_mmap_base(intis_legacy);externboolmmap_address_hint_valid(unsignedlongaddr,unsignedlonglen);+externunsignedlongget_sigframe_size(void);#ifdef CONFIG_X86_32
@@ -349,6 +351,7 @@ do { \if(vdso64_enabled)\NEW_AUX_ENT(AT_SYSINFO_EHDR,\(unsignedlong__force)current->mm->context.vdso);\+NEW_AUX_ENT(AT_MINSIGSTKSZ,get_sigframe_size());\}while(0)/* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
@@ -357,6 +360,7 @@ do { \if(vdso64_enabled)\NEW_AUX_ENT(AT_SYSINFO_EHDR,\(unsignedlong__force)current->mm->context.vdso);\+NEW_AUX_ENT(AT_MINSIGSTKSZ,get_sigframe_size());\}while(0)#define AT_SYSINFO 32
From: Chang S. Bae <hidden> Date: 2021-03-16 06:58:20
The test measures the kernel's signal delivery with different (enough vs.
insufficient) stack sizes.
Signed-off-by: Chang S. Bae <redacted>
Reviewed-by: Len Brown <redacted>
Cc: x86@kernel.org
Cc: linux-kselftest@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Changes from v3:
* Revised test messages again (Borislav Petkov)
Changes from v2:
* Revised test messages (Borislav Petkov)
---
tools/testing/selftests/x86/Makefile | 2 +-
tools/testing/selftests/x86/sigaltstack.c | 128 ++++++++++++++++++++++
2 files changed, 129 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/x86/sigaltstack.c
@@ -0,0 +1,128 @@+// SPDX-License-Identifier: GPL-2.0-only++#define _GNU_SOURCE+#include<signal.h>+#include<stdio.h>+#include<stdbool.h>+#include<string.h>+#include<err.h>+#include<errno.h>+#include<limits.h>+#include<sys/mman.h>+#include<sys/auxv.h>+#include<sys/prctl.h>+#include<sys/resource.h>+#include<setjmp.h>++/* sigaltstack()-enforced minimum stack */+#define ENFORCED_MINSIGSTKSZ 2048++#ifndef AT_MINSIGSTKSZ+# define AT_MINSIGSTKSZ 51+#endif++staticintnerrs;++staticboolsigalrm_expected;++staticunsignedlongat_minstack_size;++staticvoidsethandler(intsig,void(*handler)(int,siginfo_t*,void*),+intflags)+{+structsigactionsa;++memset(&sa,0,sizeof(sa));+sa.sa_sigaction=handler;+sa.sa_flags=SA_SIGINFO|flags;+sigemptyset(&sa.sa_mask);+if(sigaction(sig,&sa,0))+err(1,"sigaction");+}++staticvoidclearhandler(intsig)+{+structsigactionsa;++memset(&sa,0,sizeof(sa));+sa.sa_handler=SIG_DFL;+sigemptyset(&sa.sa_mask);+if(sigaction(sig,&sa,0))+err(1,"sigaction");+}++staticintsetup_altstack(void*start,unsignedlongsize)+{+stack_tss;++memset(&ss,0,sizeof(ss));+ss.ss_size=size;+ss.ss_sp=start;++returnsigaltstack(&ss,NULL);+}++staticjmp_bufjmpbuf;++staticvoidsigsegv(intsig,siginfo_t*info,void*ctx_void)+{+if(sigalrm_expected){+printf("[FAIL]\tWrong signal delivered: SIGSEGV (expected SIGALRM).");+nerrs++;+}else{+printf("[OK]\tSIGSEGV signal delivered.\n");+}++siglongjmp(jmpbuf,1);+}++staticvoidsigalrm(intsig,siginfo_t*info,void*ctx_void)+{+if(!sigalrm_expected){+printf("[FAIL]\tWrong signal delivered: SIGALRM (expected SIGSEGV).");+nerrs++;+}else{+printf("[OK]\tSIGALRM signal delivered.\n");+}+}++staticvoidtest_sigaltstack(void*altstack,unsignedlongsize)+{+if(setup_altstack(altstack,size))+err(1,"sigaltstack()");++sigalrm_expected=(size>at_minstack_size)?true:false;++sethandler(SIGSEGV,sigsegv,0);+sethandler(SIGALRM,sigalrm,SA_ONSTACK);++if(!sigsetjmp(jmpbuf,1)){+printf("[RUN]\tTest an alternate signal stack of %ssufficient size.\n",+sigalrm_expected?"":"in");+printf("\tRaise SIGALRM. %s is expected to be delivered.\n",+sigalrm_expected?"It":"SIGSEGV");+raise(SIGALRM);+}++clearhandler(SIGALRM);+clearhandler(SIGSEGV);+}++intmain(void)+{+void*altstack;++at_minstack_size=getauxval(AT_MINSIGSTKSZ);++altstack=mmap(NULL,at_minstack_size+SIGSTKSZ,PROT_READ|PROT_WRITE,+MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK,-1,0);+if(altstack==MAP_FAILED)+err(1,"mmap()");++if((ENFORCED_MINSIGSTKSZ+1)<at_minstack_size)+test_sigaltstack(altstack,ENFORCED_MINSIGSTKSZ+1);++test_sigaltstack(altstack,at_minstack_size+SIGSTKSZ);++returnnerrs==0?0:1;+}
From: Chang S. Bae <hidden> Date: 2021-03-16 06:58:20
The SIGSTKSZ constant may not represent enough stack size in some
architectures as the hardware state size grows.
Use getauxval(AT_MINSIGSTKSZ) to increase the stack size.
Signed-off-by: Chang S. Bae <redacted>
Reviewed-by: Len Brown <redacted>
Cc: linux-kselftest@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Changes from v5:
* Added as a new patch.
---
tools/testing/selftests/sigaltstack/sas.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
@@ -47,7 +53,7 @@ void my_usr1(int sig, siginfo_t *si, void *u)#endifif(sp<(unsignedlong)sstack||-sp>=(unsignedlong)sstack+SIGSTKSZ){+sp>=(unsignedlong)sstack+stack_size){ksft_exit_fail_msg("SP is not on sigaltstack\n");}/* put some data on stack. other sighandler will try to overwrite it */
@@ -108,6 +114,10 @@ int main(void)stack_tstk;interr;+/* Make sure more than the required minimum. */+stack_size=getauxval(AT_MINSIGSTKSZ)+SIGSTKSZ;+ksft_print_msg("[NOTE]\tthe stack size is %lu\n",stack_size);+ksft_print_header();ksft_set_plan(3);
@@ -117,7 +127,7 @@ int main(void)sigaction(SIGUSR1,&act,NULL);act.sa_sigaction=my_usr2;sigaction(SIGUSR2,&act,NULL);-sstack=mmap(NULL,SIGSTKSZ,PROT_READ|PROT_WRITE,+sstack=mmap(NULL,stack_size,PROT_READ|PROT_WRITE,MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK,-1,0);if(sstack==MAP_FAILED){ksft_exit_fail_msg("mmap() - %s\n",strerror(errno));
@@ -139,7 +149,7 @@ int main(void)}stk.ss_sp=sstack;-stk.ss_size=SIGSTKSZ;+stk.ss_size=stack_size;stk.ss_flags=SS_ONSTACK|SS_AUTODISARM;err=sigaltstack(&stk,NULL);if(err){
@@ -161,7 +171,7 @@ int main(void)}}-ustack=mmap(NULL,SIGSTKSZ,PROT_READ|PROT_WRITE,+ustack=mmap(NULL,stack_size,PROT_READ|PROT_WRITE,MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK,-1,0);if(ustack==MAP_FAILED){ksft_exit_fail_msg("mmap() - %s\n",strerror(errno));
@@ -170,7 +180,7 @@ int main(void)getcontext(&uc);uc.uc_link=NULL;uc.uc_stack.ss_sp=ustack;-uc.uc_stack.ss_size=SIGSTKSZ;+uc.uc_stack.ss_size=stack_size;makecontext(&uc,switch_fn,0);raise(SIGUSR1);
During signal entry, the kernel pushes data onto the normal userspace
stack. On x86, the data pushed onto the user stack includes XSAVE state,
which has grown over time as new features and larger registers have been
added to the architecture.
MINSIGSTKSZ is a constant provided in the kernel signal.h headers and
typically distributed in lib-dev(el) packages, e.g. [1]. Its value is
compiled into programs and is part of the user/kernel ABI. The MINSIGSTKSZ
constant indicates to userspace how much data the kernel expects to push on
the user stack, [2][3].
However, this constant is much too small and does not reflect recent
additions to the architecture. For instance, when AVX-512 states are in
use, the signal frame size can be 3.5KB while MINSIGSTKSZ remains 2KB.
The bug report [4] explains this as an ABI issue. The small MINSIGSTKSZ can
cause user stack overflow when delivering a signal.
uapi: Define the aux vector AT_MINSIGSTKSZ
x86/signal: Introduce helpers to get the maximum signal frame size
x86/elf: Support a new ELF aux vector AT_MINSIGSTKSZ
selftest/sigaltstack: Use the AT_MINSIGSTKSZ aux vector if available
x86/signal: Detect and prevent an alternate signal stack overflow
selftest/x86/signal: Include test cases for validating sigaltstack
So this looks really complicated, is this justified?
Why not just internally round up sigaltstack size if it's too small?
This would be more robust, as it would fix applications that use
MINSIGSTKSZ but don't use the new AT_MINSIGSTKSZ facility.
I.e. does AT_MINSIGSTKSZ have any other uses than avoiding the
segfault if MINSIGSTKSZ is used to create a small signal stack?
Thanks,
Ingo
During signal entry, the kernel pushes data onto the normal userspace
stack. On x86, the data pushed onto the user stack includes XSAVE state,
which has grown over time as new features and larger registers have been
added to the architecture.
MINSIGSTKSZ is a constant provided in the kernel signal.h headers and
typically distributed in lib-dev(el) packages, e.g. [1]. Its value is
compiled into programs and is part of the user/kernel ABI. The MINSIGSTKSZ
constant indicates to userspace how much data the kernel expects to push on
the user stack, [2][3].
However, this constant is much too small and does not reflect recent
additions to the architecture. For instance, when AVX-512 states are in
use, the signal frame size can be 3.5KB while MINSIGSTKSZ remains 2KB.
The bug report [4] explains this as an ABI issue. The small MINSIGSTKSZ can
cause user stack overflow when delivering a signal.
quoted
uapi: Define the aux vector AT_MINSIGSTKSZ
x86/signal: Introduce helpers to get the maximum signal frame size
x86/elf: Support a new ELF aux vector AT_MINSIGSTKSZ
selftest/sigaltstack: Use the AT_MINSIGSTKSZ aux vector if available
x86/signal: Detect and prevent an alternate signal stack overflow
selftest/x86/signal: Include test cases for validating sigaltstack
So this looks really complicated, is this justified?
Why not just internally round up sigaltstack size if it's too small?
This would be more robust, as it would fix applications that use
MINSIGSTKSZ but don't use the new AT_MINSIGSTKSZ facility.
I.e. does AT_MINSIGSTKSZ have any other uses than avoiding the
segfault if MINSIGSTKSZ is used to create a small signal stack?
I.e. if the kernel sees a too small ->ss_size in sigaltstack() it
would ignore ->ss_sp and mmap() a new sigaltstack instead and use that
for the signal handler stack.
This would automatically make MINSIGSTKSZ - and other too small sizes
work today, and in the future.
But the question is, is there user-space usage of sigaltstacks that
relies on controlling or reading the contents of the stack?
longjmp using programs perhaps?
Thanks,
Ingo
From: Len Brown <lenb@kernel.org> Date: 2021-03-19 18:13:46
On Wed, Mar 17, 2021 at 6:45 AM Ingo Molnar [off-list ref] wrote:
* Ingo Molnar [off-list ref] wrote:
quoted
* Chang S. Bae [off-list ref] wrote:
quoted
During signal entry, the kernel pushes data onto the normal userspace
stack. On x86, the data pushed onto the user stack includes XSAVE state,
which has grown over time as new features and larger registers have been
added to the architecture.
MINSIGSTKSZ is a constant provided in the kernel signal.h headers and
typically distributed in lib-dev(el) packages, e.g. [1]. Its value is
compiled into programs and is part of the user/kernel ABI. The MINSIGSTKSZ
constant indicates to userspace how much data the kernel expects to push on
the user stack, [2][3].
However, this constant is much too small and does not reflect recent
additions to the architecture. For instance, when AVX-512 states are in
use, the signal frame size can be 3.5KB while MINSIGSTKSZ remains 2KB.
The bug report [4] explains this as an ABI issue. The small MINSIGSTKSZ can
cause user stack overflow when delivering a signal.
quoted
uapi: Define the aux vector AT_MINSIGSTKSZ
x86/signal: Introduce helpers to get the maximum signal frame size
x86/elf: Support a new ELF aux vector AT_MINSIGSTKSZ
selftest/sigaltstack: Use the AT_MINSIGSTKSZ aux vector if available
x86/signal: Detect and prevent an alternate signal stack overflow
selftest/x86/signal: Include test cases for validating sigaltstack
So this looks really complicated, is this justified?
Why not just internally round up sigaltstack size if it's too small?
This would be more robust, as it would fix applications that use
MINSIGSTKSZ but don't use the new AT_MINSIGSTKSZ facility.
I.e. does AT_MINSIGSTKSZ have any other uses than avoiding the
segfault if MINSIGSTKSZ is used to create a small signal stack?
I.e. if the kernel sees a too small ->ss_size in sigaltstack() it
would ignore ->ss_sp and mmap() a new sigaltstack instead and use that
for the signal handler stack.
This would automatically make MINSIGSTKSZ - and other too small sizes
work today, and in the future.
But the question is, is there user-space usage of sigaltstacks that
relies on controlling or reading the contents of the stack?
longjmp using programs perhaps?
For the legacy binary that requests a too-small sigaltstack, there are
several choices:
We could detect the too-small stack at sigaltstack(2) invocation and
return an error.
This results in two deal-killing problems:
First, some applications don't check the return value, so the check
would be fruitless.
Second, those that check and error-out may be programs that never
actually take the signal, and so we'd be causing a dusty binary to
exit, when it didn't exit on another system, or another kernel.
Or we could detect the too small stack at signal registration time.
This has the same two deal-killers as above.
Then there is the approach in this patch-set, which detects an
imminent stack overflow at run time.
It has neither of the two problems above, and the benefit that we now
prevent data corruption
that could have been happening on some systems already today. The
down side is that the dusty binary
that does request the too-small stack can now die at run time.
So your idea of recognizing the problem and conjuring up a sufficient
stack is compelling,
since it would likely "just work", no matter how dumb the program.
But where would the
the sufficient stack come from -- is this a new kernel buffer, or is
there a way to abscond
some user memory? I would expect a signal handler to look at the data
on its stack
and nobody else will look at that stack. But this is already an
unreasonable program for
allocating a special signal stack in the first place :-/ So yes, one
could imagine the signal
handler could longjump instead of gracefully completing, and if this
specially allocated
signal stack isn't where the user planned, that could be trouble.
Another idea we discussed was to detect the potential overflow at run-time,
and instead of killing the process, just push the signal onto the
regular user stack.
this might actually work, but it is sort of devious; and it would not
work in the case
where the user overflowed their regular stack already, which may be
the most (only?)
compelling reason that they allocated and declared a special
sigaltstack in the first place...
--
Len Brown, Intel Open Source Technology Center
On Wed, Mar 17, 2021 at 6:45 AM Ingo Molnar [off-list ref] wrote:
quoted
* Ingo Molnar [off-list ref] wrote:
quoted
* Chang S. Bae [off-list ref] wrote:
quoted
During signal entry, the kernel pushes data onto the normal userspace
stack. On x86, the data pushed onto the user stack includes XSAVE state,
which has grown over time as new features and larger registers have been
added to the architecture.
MINSIGSTKSZ is a constant provided in the kernel signal.h headers and
typically distributed in lib-dev(el) packages, e.g. [1]. Its value is
compiled into programs and is part of the user/kernel ABI. The MINSIGSTKSZ
constant indicates to userspace how much data the kernel expects to push on
the user stack, [2][3].
However, this constant is much too small and does not reflect recent
additions to the architecture. For instance, when AVX-512 states are in
use, the signal frame size can be 3.5KB while MINSIGSTKSZ remains 2KB.
The bug report [4] explains this as an ABI issue. The small MINSIGSTKSZ can
cause user stack overflow when delivering a signal.
quoted
uapi: Define the aux vector AT_MINSIGSTKSZ
x86/signal: Introduce helpers to get the maximum signal frame size
x86/elf: Support a new ELF aux vector AT_MINSIGSTKSZ
selftest/sigaltstack: Use the AT_MINSIGSTKSZ aux vector if available
x86/signal: Detect and prevent an alternate signal stack overflow
selftest/x86/signal: Include test cases for validating sigaltstack
So this looks really complicated, is this justified?
Why not just internally round up sigaltstack size if it's too small?
This would be more robust, as it would fix applications that use
MINSIGSTKSZ but don't use the new AT_MINSIGSTKSZ facility.
I.e. does AT_MINSIGSTKSZ have any other uses than avoiding the
segfault if MINSIGSTKSZ is used to create a small signal stack?
I.e. if the kernel sees a too small ->ss_size in sigaltstack() it
would ignore ->ss_sp and mmap() a new sigaltstack instead and use that
for the signal handler stack.
This would automatically make MINSIGSTKSZ - and other too small sizes
work today, and in the future.
But the question is, is there user-space usage of sigaltstacks that
relies on controlling or reading the contents of the stack?
longjmp using programs perhaps?
For the legacy binary that requests a too-small sigaltstack, there are
several choices:
We could detect the too-small stack at sigaltstack(2) invocation and
return an error.
This results in two deal-killing problems:
First, some applications don't check the return value, so the check
would be fruitless.
Second, those that check and error-out may be programs that never
actually take the signal, and so we'd be causing a dusty binary to
exit, when it didn't exit on another system, or another kernel.
Or we could detect the too small stack at signal registration time.
This has the same two deal-killers as above.
Then there is the approach in this patch-set, which detects an
imminent stack overflow at run time.
It has neither of the two problems above, and the benefit that we now
prevent data corruption
that could have been happening on some systems already today. The
down side is that the dusty binary
that does request the too-small stack can now die at run time.
So your idea of recognizing the problem and conjuring up a
sufficient stack is compelling, since it would likely "just work",
no matter how dumb the program. But where would the the sufficient
stack come from -- is this a new kernel buffer, or is there a way to
abscond some user memory? I would expect a signal handler to look
at the data on its stack and nobody else will look at that stack.
But this is already an unreasonable program for allocating a special
signal stack in the first place :-/ So yes, one could imagine the
signal handler could longjump instead of gracefully completing, and
if this specially allocated signal stack isn't where the user
planned, that could be trouble.
We could mmap() (implicitly) new anonymous memory - but I can see why
this is probably more trouble than worth...
Another idea we discussed was to detect the potential overflow at
run-time, and instead of killing the process, just push the signal
onto the regular user stack. this might actually work, but it is
sort of devious; and it would not work in the case where the user
overflowed their regular stack already, which may be the most
(only?) compelling reason that they allocated and declared a special
sigaltstack in the first place...
Yeah, this doesn't sound deterministic enough.
Ok, thanks for the detailed answers - I withdraw my objections, let's
proceed with the approach you are proposing?
Thanks,
Ingo