fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-15 16:01:41 +00:00
Code Issues Projects Releases Wiki Activity

use separate sigaction buffers for old and new data

Browse Source 
in signal() it is needed since __sigaction uses restrict in parameters
and sharing the buffer is technically an aliasing error. do the same
for the syscall, as at least qemu-user does not handle it properly.
This commit is contained in:
Timo Teräs
2013-07-30 09:14:56 -04:00
committed by Rich Felker
parent 372a948b81
commit 48748143a3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/signal/sigaction.c
View File

@ -14,7 +14,7 @@ weak_alias(dummy, __pthread_self_def);
int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old) int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
{ {
struct k_sigaction ksa; struct k_sigaction ksa, ksa_old;
if (sa) { if (sa) {
if ((uintptr_t)sa->sa_handler > 1UL) if ((uintptr_t)sa->sa_handler > 1UL)
__pthread_self_def(); __pthread_self_def();
@ -23,12 +23,12 @@ int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigact
ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore; ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask); memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
} }
if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask)) if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask))
return -1; return -1;
if (old) { if (old) {
old->sa_handler = ksa.handler; old->sa_handler = ksa_old.handler;
old->sa_flags = ksa.flags; old->sa_flags = ksa_old.flags;
memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask); memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
} }
return 0; return 0;
} }

6
src/signal/signal.c
View File

@ -7,10 +7,10 @@ int __sigaction(int, const struct sigaction *, struct sigaction *);
void (*signal(int sig, void (*func)(int)))(int) void (*signal(int sig, void (*func)(int)))(int)
{ {
struct sigaction sa = { .sa_handler = func, .sa_flags = SA_RESTART }; struct sigaction sa_old, sa = { .sa_handler = func, .sa_flags = SA_RESTART };
if (__sigaction(sig, &sa, &sa) < 0) if (__sigaction(sig, &sa, &sa_old) < 0)
return SIG_ERR; return SIG_ERR;
return sa.sa_handler; return sa_old.sa_handler;
} }
weak_alias(signal, bsd_signal); weak_alias(signal, bsd_signal);