diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-07-30 09:14:56 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-07-30 09:14:56 -0400 |
| commit | 48748143a34fb534e51378ec82816d7bbfb22df7 (patch) | |
| tree | 079a45f547fa0ac4a45dd60ad9817e227b8a8f69 | |
| parent | 372a948b8139c6583045b2cd91b6b91fcb2e5881 (diff) | |
| download | musl-48748143a34fb534e51378ec82816d7bbfb22df7.tar.gz | |
use separate sigaction buffers for old and new data
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.
| -rw-r--r-- | src/signal/sigaction.c | 10 | ||||
| -rw-r--r-- | src/signal/signal.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c index 7a72a44b..1f09bb96 100644 --- a/src/signal/sigaction.c +++ b/src/signal/sigaction.c @@ -14,7 +14,7 @@ weak_alias(dummy, __pthread_self_def); 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 ((uintptr_t)sa->sa_handler > 1UL) __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; 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; if (old) { - old->sa_handler = ksa.handler; - old->sa_flags = ksa.flags; - memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask); + old->sa_handler = ksa_old.handler; + old->sa_flags = ksa_old.flags; + memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask); } return 0; } diff --git a/src/signal/signal.c b/src/signal/signal.c index 07346a8a..9d2f23ab 100644 --- a/src/signal/signal.c +++ b/src/signal/signal.c @@ -7,10 +7,10 @@ int __sigaction(int, const struct sigaction *, struct sigaction *); void (*signal(int sig, void (*func)(int)))(int) { - struct sigaction sa = { .sa_handler = func, .sa_flags = SA_RESTART }; - if (__sigaction(sig, &sa, &sa) < 0) + struct sigaction sa_old, sa = { .sa_handler = func, .sa_flags = SA_RESTART }; + if (__sigaction(sig, &sa, &sa_old) < 0) return SIG_ERR; - return sa.sa_handler; + return sa_old.sa_handler; } weak_alias(signal, bsd_signal); |