avoid the thread-ptr-init behavior of sigaction when not installing handler

[musl] / src / signal / sigaction.c

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index e0c58b7..d953503 100644 (file)
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -11,16 +11,17 @@ void __restore(), __restore_rt();
 static pthread_t dummy(void) { return 0; }
 weak_alias(dummy, __pthread_self_def);
 
-int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
+int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
        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) {
@@ -31,7 +32,7 @@ int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
        return 0;
 }
 
-int __sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
+int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
        if (sig-32U < 3) {
                errno = EINVAL;