summaryrefslogtreecommitdiff
path: root/udev/udev-event.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2009-09-05 17:48:23 +1000
committerKay Sievers <kay.sievers@vrfy.org>2009-09-07 12:13:50 +0200
commitd412a685736e3b3350b555f4d7d8ebfc80aa54c9 (patch)
tree6e49304c9c86a1db4711f1df8fcc4d6d4ca0344a /udev/udev-event.c
parent9e6273c713c5a4b4317decca33d2fba830562ff2 (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/udev-event.c')
-rw-r--r--udev/udev-event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/udev/udev-event.c b/udev/udev-event.c
index 8183793e5f..7b4e4ac5c3 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -722,7 +722,7 @@ exit:
return err;
}
-int udev_event_execute_run(struct udev_event *event)
+int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
{
struct udev_list_entry *list_entry;
int err = 0;
@@ -745,7 +745,7 @@ int udev_event_execute_run(struct udev_event *event)
udev_event_apply_format(event, cmd, program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
- if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
+ if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) {
if (udev_list_entry_get_flag(list_entry))
err = -1;
}