From 7cc49f98a2b5346259d2209ba14d7c18959f9369 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 31 Aug 2013 01:12:00 -0400 Subject: [PATCH] fix breakage in synccall due to incorrect signal restoration in sigqueue commit 07827d1a82fb33262f686eda959857f0d28cd8fa seems to have introduced this issue. sigqueue is called from the synccall core, at which time, even implementation-internal signals are blocked. however, pthread_sigmask removes the implementation-internal signals from the old mask before returning, so that a process which began life with them blocked will not be able to save a signal mask that has them blocked, possibly causing them to become re-blocked later. however, this was causing sigqueue to unblock the implementation-internal signals during synccall, leading to deadlock. --- src/signal/sigqueue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/signal/sigqueue.c b/src/signal/sigqueue.c index bdb12856..eb4d184f 100644 --- a/src/signal/sigqueue.c +++ b/src/signal/sigqueue.c @@ -3,6 +3,7 @@ #include #include #include "syscall.h" +#include "pthread_impl.h" int sigqueue(pid_t pid, int sig, const union sigval value) { @@ -14,9 +15,9 @@ int sigqueue(pid_t pid, int sig, const union sigval value) si.si_code = SI_QUEUE; si.si_value = value; si.si_uid = getuid(); - pthread_sigmask(SIG_BLOCK, (void *)(uint64_t[1]){-1}, &set); + __block_app_sigs(&set); si.si_pid = getpid(); r = syscall(SYS_rt_sigqueueinfo, pid, sig, &si); - pthread_sigmask(SIG_SETMASK, &set, 0); + __restore_sigs(&set); return r; } -- 2.25.1