diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2009-09-05 17:48:23 +1000 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-09-07 12:13:50 +0200 |
| commit | d412a685736e3b3350b555f4d7d8ebfc80aa54c9 (patch) | |
| tree | 6e49304c9c86a1db4711f1df8fcc4d6d4ca0344a /udev/udevd.c | |
| parent | 9e6273c713c5a4b4317decca33d2fba830562ff2 (diff) | |
util_run_program: restore signal mask before executing event RUN commands
External programs triggered by events (via RUN=) will inherit udev's
signal mask, which is set to block all but SIGALRM. For most utilities,
this is OK, but if we start daemons from RUN=, we run into trouble
(especially as SIGCHLD is blocked).
This change saves the original sigmask when udev starts, and restores it
just before we exec() the external command.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'udev/udevd.c')
| -rw-r--r-- | udev/udevd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/udev/udevd.c b/udev/udevd.c index 54064cbfcf..2eb914a3f3 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -79,6 +79,7 @@ static bool stop_exec_queue; static bool reload_config; static int max_childs; static int childs; +static sigset_t orig_sigmask; static struct udev_list_node event_list; static struct udev_list_node worker_list; static bool udev_exit; @@ -292,7 +293,8 @@ static void worker_new(struct event *event) /* execute RUN= */ if (err == 0 && !udev_event->ignore_device && udev_get_run(udev_event->udev)) - failed = udev_event_execute_run(udev_event); + failed = udev_event_execute_run(udev_event, + &orig_sigmask); /* reset alarm */ alarm(0); @@ -926,7 +928,7 @@ int main(int argc, char *argv[]) /* block and listen to all signals on signalfd */ sigfillset(&mask); - sigprocmask(SIG_SETMASK, &mask, NULL); + sigprocmask(SIG_SETMASK, &mask, &orig_sigmask); pfd[FD_SIGNAL].fd = signalfd(-1, &mask, 0); if (pfd[FD_SIGNAL].fd < 0) { fprintf(stderr, "error getting signalfd\n"); |