From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 Dec 2013 20:44:20 +0000 (+0100)
Subject: sd-event: make sd_event_add_signal() fail with EBUSY if signal is not blocked
X-Git-Tag: v209~679
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3022d74ba585f961de7015087cd95673705bee3c

sd-event: make sd_event_add_signal() fail with EBUSY if signal is not blocked
---

diff --git a/src/libsystemd-bus/sd-event.c b/src/libsystemd-bus/sd-event.c
index 0317088af..0b7b71d16 100644
--- a/src/libsystemd-bus/sd-event.c
+++ b/src/libsystemd-bus/sd-event.c
@@ -22,6 +22,7 @@
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 #include <sys/wait.h>
+#include <pthread.h>
 
 #include "sd-id128.h"
 #include "sd-daemon.h"
@@ -813,6 +814,7 @@ _public_ int sd_event_add_signal(
                 sd_event_source **ret) {
 
         sd_event_source *s;
+        sigset_t ss;
         int r;
 
         assert_return(e, -EINVAL);
@@ -823,6 +825,13 @@ _public_ int sd_event_add_signal(
         assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
         assert_return(!event_pid_changed(e), -ECHILD);
 
+        r = pthread_sigmask(SIG_SETMASK, NULL, &ss);
+        if (r < 0)
+                return -errno;
+
+        if (!sigismember(&ss, sig))
+                return -EBUSY;
+
         if (!e->signal_sources) {
                 e->signal_sources = new0(sd_event_source*, _NSIG);
                 if (!e->signal_sources)