From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 14 Dec 2021 06:38:12 +0000 (+0900)
Subject: home: fix heap-use-after-free
X-Git-Tag: v250-rc3~48^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F21769%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

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;