diff options
author | Rich Felker <dalias@aerifal.cx> | 2023-02-09 11:52:44 -0500 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2023-02-09 12:33:35 -0500 |
commit | 269d193820342dc109f39909d78fb30f4c978f76 (patch) | |
tree | 2acbae503e21dca93feb669b5d5a890ee915a797 /src/internal | |
parent | ea3b40a321e751e016948087ef23ae7b9e8e0150 (diff) | |
download | musl-269d193820342dc109f39909d78fb30f4c978f76.tar.gz musl-269d193820342dc109f39909d78fb30f4c978f76.tar.bz2 musl-269d193820342dc109f39909d78fb30f4c978f76.tar.xz musl-269d193820342dc109f39909d78fb30f4c978f76.zip |
fix wrong sigaction syscall ABI on mips*, or1k, microblaze, riscv64
we wrongly defined a dummy SA_RESTORER flag on these archs, despite
the kernel interface not actually having such a feature. on archs
which lack SA_RESTORER, the kernel sigaction structure also lacks the
restorer function pointer member, which means the signal mask appears
at a different offset. the kernel was thereby interpreting the bits of
the code address as part of the signal set to be masked while handling
the signal.
this patch removes the erroneous SA_RESTORER definitions from archs
which do not have it, makes access to the member conditional on
whether SA_RESTORER is defined for the arch, and removes the
now-unused asm for the affected archs.
because there are reportedly versions of qemu-user which also use the
wrong ABI here, the old ksigaction struct size is preserved with an
unused member at the end. this is harmless and mitigates the risk of
such a bug turning into a buffer overflow onto the sigaction
function's stack.
Diffstat (limited to 'src/internal')
-rw-r--r-- | src/internal/ksigaction.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/internal/ksigaction.h b/src/internal/ksigaction.h index 8ebd5938..ef333f33 100644 --- a/src/internal/ksigaction.h +++ b/src/internal/ksigaction.h @@ -6,8 +6,13 @@ struct k_sigaction { void (*handler)(int); unsigned long flags; +#ifdef SA_RESTORER void (*restorer)(void); +#endif unsigned mask[2]; +#ifndef SA_RESTORER + void *unused; +#endif }; hidden void __restore(), __restore_rt(); |