about summary refs log tree commit diff
path: root/src/signal
diff options
context:
space:
mode:
Diffstat (limited to 'src/signal')
-rw-r--r--src/signal/sigaction.c16
-rw-r--r--src/signal/sigismember.c5
2 files changed, 16 insertions, 5 deletions
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 1f09bb96..5499bd18 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -12,12 +12,26 @@ void __restore(), __restore_rt();
 static pthread_t dummy(void) { return 0; }
 weak_alias(dummy, __pthread_self_def);
 
+static unsigned long handler_set[_NSIG/(8*sizeof(long))];
+
+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, ksa_old;
+	if (sig >= (unsigned)_NSIG) {
+		errno = EINVAL;
+		return -1;
+	}
 	if (sa) {
-		if ((uintptr_t)sa->sa_handler > 1UL)
+		if ((uintptr_t)sa->sa_handler > 1UL) {
+			a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
+				1UL<<(sig-1)%(8*sizeof(long)));
 			__pthread_self_def();
+		}
 		ksa.handler = sa->sa_handler;
 		ksa.flags = sa->sa_flags | SA_RESTORER;
 		ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
diff --git a/src/signal/sigismember.c b/src/signal/sigismember.c
index e887b95f..1a22108b 100644
--- a/src/signal/sigismember.c
+++ b/src/signal/sigismember.c
@@ -4,9 +4,6 @@
 int sigismember(const sigset_t *set, int sig)
 {
 	unsigned s = sig-1;
-	if (s >= 8*sizeof(sigset_t) || sig-32U<3) {
-		errno = EINVAL;
-		return -1;
-	}
+	if (s >= 8*sizeof(sigset_t)) return 0;
 	return !!(set->__bits[s/8/sizeof *set->__bits] & 1UL<<(s&8*sizeof *set->__bits-1));
 }