From 2c6b0ad7f6bc0727717d455894f51cbb39b77bf3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 20 Feb 2020 00:36:53 +0000 Subject: bus: Don't explicitly clear BusConnections.monitors Each connection that is an active monitor holds a pointer to its own link in this list, via BusConnectionData.link_in_monitors. We can't validly free the list while these pointers exist: that would be a use-after-free, when each connection gets disconnected and tries to remove itself from the list. Instead, let each connection remove itself from the list, then assert that the list has become empty. Signed-off-by: Simon McVittie Resolves: https://gitlab.freedesktop.org/dbus/dbus/issues/291 (cherry picked from commit b034b83b59efffd4cc819ad42d0cd078d91d53df) --- bus/connection.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bus/connection.c b/bus/connection.c index 53605fa3..b3583433 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -537,9 +537,6 @@ bus_connections_unref (BusConnections *connections) _dbus_assert (connections->n_incomplete == 0); - /* drop all monitors */ - _dbus_list_clear (&connections->monitors); - /* drop all real connections */ while (connections->completed != NULL) { @@ -555,6 +552,10 @@ bus_connections_unref (BusConnections *connections) _dbus_assert (connections->n_completed == 0); + /* disconnecting all the connections should have emptied the list of + * monitors (each link is removed in bus_connection_disconnected) */ + _dbus_assert (connections->monitors == NULL); + bus_expire_list_free (connections->pending_replies); _dbus_loop_remove_timeout (bus_context_get_loop (connections->context), -- cgit v1.2.3