shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

udevd: fix crash when workers time out after exit is signal caught

Browse Source 
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().
This commit is contained in:
Martin Wilck 2019-11-12 16:43:42 +01:00
parent bfde9421af
commit 7b6596d748
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/udev/udevd.c
View File

@ -293,6 +293,8 @@ static void manager_free(Manager *manager) {
if (!manager) if (!manager)
return; return;
manager->monitor = sd_device_monitor_unref(manager->monitor);
udev_builtin_exit(); udev_builtin_exit();
if (manager->pid == getpid_cached()) 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->inotify_event = sd_event_source_unref(manager->inotify_event);
manager->fd_inotify = safe_close(manager->fd_inotify); manager->fd_inotify = safe_close(manager->fd_inotify);
manager->monitor = sd_device_monitor_unref(manager->monitor);
/* discard queued events and kill workers */ /* discard queued events and kill workers */
event_queue_cleanup(manager, EVENT_QUEUED); event_queue_cleanup(manager, EVENT_QUEUED);
manager_kill_workers(manager); manager_kill_workers(manager);