diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-10-11 22:51:05 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-10-11 22:51:05 -0400 |
| commit | 964e9f3c4c8776820e98c967f3a411d4ca5075a7 (patch) | |
| tree | 7242af337a05f398e3e25bd9e30b98f3ab47cae6 | |
| parent | 12e9b4faf68a1a02ebf5ad69c03ac10f170f14cb (diff) | |
| download | musl-964e9f3c4c8776820e98c967f3a411d4ca5075a7.tar.gz musl-964e9f3c4c8776820e98c967f3a411d4ca5075a7.tar.bz2 musl-964e9f3c4c8776820e98c967f3a411d4ca5075a7.tar.xz musl-964e9f3c4c8776820e98c967f3a411d4ca5075a7.zip | |
avoid the thread-ptr-init behavior of sigaction when not installing handler
this is necessary because posix_spawn calls sigaction after vfork, and
if the thread pointer is not already initialized, initializing it in
the child corrupts the parent process's state.
| -rw-r--r-- | src/signal/sigaction.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c index 2331dc93..d9535032 100644 --- a/src/signal/sigaction.c +++ b/src/signal/sigaction.c @@ -15,12 +15,13 @@ int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigact { struct k_sigaction ksa; if (sa) { + if ((uintptr_t)sa->sa_handler > 1UL) + __pthread_self_def(); ksa.handler = sa->sa_handler; ksa.flags = sa->sa_flags | SA_RESTORER; ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore; memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask); } - __pthread_self_def(); if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask)) return -1; if (old) { |