From 2ff457720bd3bc59985e807b748f6305bdf27826 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 14 Dec 2021 15:38:12 +0900 Subject: [PATCH] home: fix heap-use-after-free `bus_home_emit_remove()` may be called from manager_free() -> home_free(). In that case, manager->bus is already unref()ed. Fixes #21767. --- src/home/homed-home-bus.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/home/homed-home-bus.c b/src/home/homed-home-bus.c index 9e9f537d6c8..61d46907809 100644 --- a/src/home/homed-home-bus.c +++ b/src/home/homed-home-bus.c @@ -940,6 +940,12 @@ int bus_home_emit_remove(Home *h) { if (!h->announced) return 0; + if (!h->manager) + return 0; + + if (!h->manager->bus) + return 0; + r = bus_home_path(h, &path); if (r < 0) return r; -- 2.47.3