X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_kill.c;h=79ddb20978f7513f35789209d3d4b3be13df1a46;hb=b1dfb734a45d4f74c7a24c5f07d37f7e74451802;hp=0a139231caae5afad1ae11b54f659fd64fecb07f;hpb=4df42163511182bfd6fc55e85250b93786dcce7e;p=musl

diff --git a/src/thread/pthread_kill.c b/src/thread/pthread_kill.c
index 0a139231..79ddb209 100644
--- a/src/thread/pthread_kill.c
+++ b/src/thread/pthread_kill.c
@@ -1,11 +1,18 @@
 #include "pthread_impl.h"
+#include "lock.h"
 
 int pthread_kill(pthread_t t, int sig)
 {
 	int r;
+	sigset_t set;
+	/* Block not just app signals, but internal ones too, since
+	 * pthread_kill is used to implement pthread_cancel, which
+	 * must be async-cancel-safe. */
+	__block_all_sigs(&set);
 	LOCK(t->killlock);
-	r = t->dead ? (sig+0U >= _NSIG ? EINVAL : 0)
-		: -__syscall(SYS_tkill, t->tid, sig);
+	r = t->tid ? -__syscall(SYS_tkill, t->tid, sig)
+		: (sig+0U >= _NSIG ? EINVAL : 0);
 	UNLOCK(t->killlock);
+	__restore_sigs(&set);
 	return r;
 }