use a separate signal from SIGCANCEL for SIGEV_THREAD timers

[musl] / src / signal / sigprocmask.c

diff --git a/src/signal/sigprocmask.c b/src/signal/sigprocmask.c
index 1bc5baa..a272c10 100644 (file)
--- a/src/signal/sigprocmask.c
+++ b/src/signal/sigprocmask.c
@@ -1,25 +1,30 @@
 #include <signal.h>
+#include <errno.h>
 #include "syscall.h"
 #include "libc.h"
 #include "pthread_impl.h"
 
 int __libc_sigprocmask(int how, const sigset_t *set, sigset_t *old)
 {
-       return syscall4(__NR_rt_sigprocmask, how, (long)set, (long)old, 8);
+       return syscall(SYS_rt_sigprocmask, how, set, old, 8);
 }
 
 int __sigprocmask(int how, const sigset_t *set, sigset_t *old)
 {
        sigset_t tmp;
+       if (how > 2U) {
+               errno = EINVAL;
+               return -1;
+       }
        /* Disallow blocking thread control signals */
        if (set && how != SIG_UNBLOCK) {
                tmp = *set;
                set = &tmp;
                sigdelset(&tmp, SIGCANCEL);
                sigdelset(&tmp, SIGSYSCALL);
+               sigdelset(&tmp, SIGTIMER);
        }
        return __libc_sigprocmask(how, set, old);
 }
 
 weak_alias(__sigprocmask, sigprocmask);
-weak_alias(__sigprocmask, pthread_sigmask);