From d42f7d45a8e23052a1dad8d50949475b73d52a97 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 26 Nov 2019 18:36:46 +0100 Subject: [PATCH] Revert "udevd: fix crash when workers time out after exit is signal caught" This reverts commit 5db454b8031c58a743cc4ee3d5d1dd01dcff17e8. See https://github.com/systemd/systemd/issues/14128 (cherry picked from commit 3cabdc2345608b01e344a52fe6f8c3c378406ebc) --- src/udev/udevd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 02b99ecab8..cb5123042a 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -296,8 +296,6 @@ 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()) @@ -808,6 +806,8 @@ 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); -- 2.25.1