mirror of
https://github.com/systemd/systemd.git
synced 2025-02-28 05:57:33 +03:00
sd-event: make sd_event_add_signal() fail with EBUSY if signal is not blocked
This commit is contained in:
parent
be04cbca6c
commit
3022d74ba5
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user