From 6ef4d0dc99284b2c599b93d5678bc6f073296d53 Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 21 Jan 2015 16:13:37 +0000 Subject: [PATCH] Fix bug in r276630. Do not allow pthread_sigmask() to block SIGCANCEL. Reported and tested by: royger Sponsored by: The FreeBSD Foundation MFC after: 3 days --- lib/libthr/thread/thr_sig.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index 7cd0f75412d8..11a131c1c5a4 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -604,7 +604,8 @@ __weak_reference(_pthread_sigmask, pthread_sigmask); int _pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) { - if (_sigprocmask(how, set, oset)) + + if (__thr_sigprocmask(how, set, oset)) return (errno); return (0); }