X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fsignal%2Fsigprocmask.c;h=1bc5baa6c88809d49b7bf861c2b611ef4a370e1e;hb=96f2197494791f5884c01b5caa908074cc7e90a6;hp=e89f8765bc93bb3394bb6204b10a6127069234f3;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/signal/sigprocmask.c b/src/signal/sigprocmask.c
index e89f8765..1bc5baa6 100644
--- a/src/signal/sigprocmask.c
+++ b/src/signal/sigprocmask.c
@@ -1,6 +1,7 @@
 #include <signal.h>
 #include "syscall.h"
 #include "libc.h"
+#include "pthread_impl.h"
 
 int __libc_sigprocmask(int how, const sigset_t *set, sigset_t *old)
 {
@@ -10,11 +11,12 @@ int __libc_sigprocmask(int how, const sigset_t *set, sigset_t *old)
 int __sigprocmask(int how, const sigset_t *set, sigset_t *old)
 {
 	sigset_t tmp;
-	/* Quickly mask out bits 32 and 33 (thread control signals) */
-	if (0 && how != SIG_UNBLOCK && (set->__bits[4/sizeof *set->__bits] & 3UL<<(32&8*sizeof *set->__bits-1))) {
+	/* Disallow blocking thread control signals */
+	if (set && how != SIG_UNBLOCK) {
 		tmp = *set;
 		set = &tmp;
-		tmp.__bits[4/sizeof *set->__bits] &= ~(3UL<<(32&8*sizeof *set->__bits-1));
+		sigdelset(&tmp, SIGCANCEL);
+		sigdelset(&tmp, SIGSYSCALL);
 	}
 	return __libc_sigprocmask(how, set, old);
 }