From: Rich Felker Date: Sat, 19 Feb 2011 15:51:13 +0000 (-0500) Subject: prevent sigprocmask/pthread_sigmask from blocking implementation signals X-Git-Tag: v0.7.0~88 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a49c119276742d7d212fb88f83a8f559ca549e72;p=oweals%2Fmusl.git prevent sigprocmask/pthread_sigmask from blocking implementation signals this code was wrongly disabled because the old version was trying to be too clever and didn't work. replaced it with a simple version for now. --- diff --git a/src/signal/sigprocmask.c b/src/signal/sigprocmask.c index e89f8765..db27f12a 100644 --- a/src/signal/sigprocmask.c +++ b/src/signal/sigprocmask.c @@ -1,6 +1,7 @@ #include #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 (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); }