avoid the thread-ptr-init behavior of sigaction when not installing handler
authorRich Felker <dalias@aerifal.cx>
Fri, 12 Oct 2012 02:51:05 +0000 (22:51 -0400)
committerRich Felker <dalias@aerifal.cx>
Fri, 12 Oct 2012 02:51:05 +0000 (22:51 -0400)
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.

src/signal/sigaction.c

index 2331dc93b6886a3abe9b141c16f350fa519aa974..d9535032d89d960f170e6b457b80cf86e8d5ad62 100644 (file)
@@ -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) {