diff options
author | Martin Wilck <mwilck@suse.com> | 2019-11-12 16:43:42 +0100 |
---|---|---|
committer | Martin Wilck <mwilck@suse.com> | 2019-11-12 16:43:42 +0100 |
commit | 7b6596d7489421842af854ed16333ea747879732 (patch) | |
tree | 91b5099e3125d9dadf212385f16eb5a69aa96a1a | |
parent | bfde9421af1458e18999d787b1ab46a6a33e8bb6 (diff) | |
download | systemd-7b6596d7489421842af854ed16333ea747879732.tar.gz |
udevd: fix crash when workers time out after exit is signal caught
If udevd receives an exit signal, it releases its reference on the udev
monitor in manager_exit(). If at this time a worker is hanging, and if
the event timeout for this worker expires before udevd exits, udevd
crashes in on_sigchld()->udev_monitor_send_device(), because the monitor
has already been freed.
Fix this by releasing the main process's monitor ref later, in
manager_free().
-rw-r--r-- | src/udev/udevd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 144a20ec63..2bb322796b 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -293,6 +293,8 @@ static void manager_free(Manager *manager) { if (!manager) return; + manager->monitor = sd_device_monitor_unref(manager->monitor); + udev_builtin_exit(); if (manager->pid == getpid_cached()) @@ -789,8 +791,6 @@ static void manager_exit(Manager *manager) { manager->inotify_event = sd_event_source_unref(manager->inotify_event); manager->fd_inotify = safe_close(manager->fd_inotify); - manager->monitor = sd_device_monitor_unref(manager->monitor); - /* discard queued events and kill workers */ event_queue_cleanup(manager, EVENT_QUEUED); manager_kill_workers(manager); |