X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fsignal%2Fsigaction.c;h=6eca06f11fb63c3aa260fce4cdc8104458fd9117;hb=140ad50cbf9244eecc21a0126c743396a34e8106;hp=2331dc93b6886a3abe9b141c16f350fa519aa974;hpb=400c5e5c8307a2ebe44ef1f203f5a15669f20347;p=musl

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 2331dc93..6eca06f1 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -1,39 +1,59 @@
-#include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
+#include <string.h>
 #include "syscall.h"
 #include "pthread_impl.h"
 #include "libc.h"
 #include "ksigaction.h"
 
-void __restore(), __restore_rt();
+static int unmask_done;
+static unsigned long handler_set[_NSIG/(8*sizeof(long))];
 
-static pthread_t dummy(void) { return 0; }
-weak_alias(dummy, __pthread_self_def);
+void __get_handler_set(sigset_t *set)
+{
+	memcpy(set, handler_set, sizeof handler_set);
+}
 
 int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
-	struct k_sigaction ksa;
+	struct k_sigaction ksa, ksa_old;
 	if (sa) {
+		if ((uintptr_t)sa->sa_handler > 1UL) {
+			a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
+				1UL<<(sig-1)%(8*sizeof(long)));
+
+			/* If pthread_create has not yet been called,
+			 * implementation-internal signals might not
+			 * yet have been unblocked. They must be
+			 * unblocked before any signal handler is
+			 * installed, so that an application cannot
+			 * receive an illegal sigset_t (with them
+			 * blocked) as part of the ucontext_t passed
+			 * to the signal handler. */
+			if (!libc.threaded && !unmask_done) {
+				__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+					SIGPT_SET, 0, _NSIG/8);
+				unmask_done = 1;
+			}
+		}
 		ksa.handler = sa->sa_handler;
 		ksa.flags = sa->sa_flags | SA_RESTORER;
 		ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
 		memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
 	}
-	__pthread_self_def();
-	if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask))
+	if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask))
 		return -1;
 	if (old) {
-		old->sa_handler = ksa.handler;
-		old->sa_flags = ksa.flags;
-		memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask);
+		old->sa_handler = ksa_old.handler;
+		old->sa_flags = ksa_old.flags;
+		memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
 	}
 	return 0;
 }
 
 int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
-	if (sig-32U < 3) {
+	if (sig-32U < 3 || sig-1U >= _NSIG-1) {
 		errno = EINVAL;
 		return -1;
 	}