50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 2b04ec4cfae111f315514395030ab1106b6370da Mon Sep 17 00:00:00 2001
|
|
Message-Id: <2b04ec4cfae111f315514395030ab1106b6370da@dist-git>
|
|
From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
|
|
Date: Fri, 16 Aug 2019 16:01:55 +0200
|
|
Subject: [PATCH] virdbus: Grab a ref as long as the while loop is executed
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Grab a ref for info->bus (a DBus connection) as long as the while loop
|
|
is running. With the grabbed reference it is ensured that info->bus
|
|
isn't freed as long as the while loop is executed. This is necessary
|
|
as it's allowed to drop the last ref for the bus connection in a
|
|
handler.
|
|
|
|
There was already a bug of this kind in libdbus itself:
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=15635.
|
|
|
|
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
(cherry picked from commit 6707ffd11c1d8940ca7dfa7aaef707a60ef6756e)
|
|
|
|
RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1741900
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Message-Id: <9656cea8218d901d5e44a157362cd0f009ff1a7d.1565964111.git.jtomko@redhat.com>
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
---
|
|
src/util/virdbus.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
|
|
index ba8b684f17..d0e2c76e48 100644
|
|
--- a/src/util/virdbus.c
|
|
+++ b/src/util/virdbus.c
|
|
@@ -198,8 +198,10 @@ static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
|
|
|
|
(void)dbus_watch_handle(watch, dbus_flags);
|
|
|
|
+ dbus_connection_ref(info->bus);
|
|
while (dbus_connection_dispatch(info->bus) == DBUS_DISPATCH_DATA_REMAINS)
|
|
/* keep dispatching while data remains */;
|
|
+ dbus_connection_unref(info->bus);
|
|
}
|
|
|
|
|
|
--
|
|
2.22.1
|
|
|