SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev-manager: do not free device monitor when asked to terminate

Browse Source 
Otherwise, if a worker process exited abnormally, the manager cannot
broadcast the kernel event assigned to the worker.
This commit is contained in:
Yu Watanabe
2025-04-02 23:24:35 +09:00
parent f5c626df2c
commit 32333754ae
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-manager.c
+5 -1
View File
@@ -236,7 +236,11 @@ void manager_exit(Manager *manager) {
manager->inotify_event = sd_event_source_disable_unref(manager->inotify_event);
manager->inotify_fd = safe_close(manager->inotify_fd);
manager->monitor = sd_device_monitor_unref(manager->monitor);
/* Disable the device monitor but do not free device monitor, as it may be used when a worker failed,
* and the manager needs to broadcast the kernel event assigned to the worker to libudev listeners.
* Note, hwere we cannot use sd_device_monitor_stop(), as it changes the multicast group of the socket. */
(void) sd_event_source_set_enabled(sd_device_monitor_get_event_source(manager->monitor), SD_EVENT_OFF);
(void) sd_device_monitor_detach_event(manager->monitor);
/* discard queued events and kill workers */
event_queue_cleanup(manager, EVENT_QUEUED);