Attachment 1446757 Details for Bug 1579858 – [PATCH v2] settings: let connections keep NMSettings alive

[patch] [PATCH v2] settings: let connections keep NMSettings alive

0001-settings-let-connections-keep-NMSettings-alive.patch (text/plain), 3.24 KB, created by Beniamino Galvani on 2018-06-01 17:00:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beniamino Galvani

Created: 2018-06-01 17:00:53 UTC

Size: 3.24 KB

patch

obsolete

>From 2c0569a5d6b8ccea08831358d3dbe7724f7e6d13 Mon Sep 17 00:00:00 2001
>From: Beniamino Galvani <bgalvani@redhat.com>
>Date: Fri, 1 Jun 2018 18:50:39 +0200
>Subject: [PATCH v2] settings: let connections keep NMSettings alive
>
>The NMSettings instance can't be disposed while there is any exported
>connection. Ideally we should unexport all connections on NMSettings'
>disposal, but for now leak @self on termination when there are
>connections alive.
>
>This fixes the following bug on shutdown:
>
> assertion failed: (c_list_is_empty (&priv->connections_lst_head))
> #0  raise () from target:/lib64/libc.so.6
> #1  abort () from target:/lib64/libc.so.6
> #2  g_assertion_message (domain=0x66cab2 "NetworkManager", file=0x6a5e48 "src/settings/nm-settings.c", line=1929)
> #3  g_assertion_message_expr () at gtestutils.c:2555
> #4  finalize (object=0x1dab170) at src/settings/nm-settings.c:1929
> #5  g_object_unref (_object=0x1dab170) at gobject.c:3340
> #6  dispose (object=0x1de50b0) at src/nm-manager.c:7139
> #7  g_object_unref (_object=0x1de50b0) at gobject.c:3303
> #8  _nm_singleton_instance_destroy () at src/nm-core-utils.c:138
> #9  _dl_fini () from target:/lib64/ld-linux-x86-64.so.2
> #10 __run_exit_handlers () from target:/lib64/libc.so.6
> #11 exit () from target:/lib64/libc.so.6
> #12 main (argc=<optimized out>, argv=<optimized out>) at src/main.c:460
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1579858
>---
> src/settings/nm-settings.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
>index 6ad2624df..037be5389 100644
>--- a/src/settings/nm-settings.c
>+++ b/src/settings/nm-settings.c
>@@ -881,16 +881,18 @@ connection_removed (NMSettingsConnection *connection, gpointer user_data)
> 	nm_dbus_object_unexport (NM_DBUS_OBJECT (connection));
> 
> 	if (priv->connections_loaded)
> 		g_signal_emit (self, signals[CONNECTION_REMOVED], 0, connection);
> 
> 	g_object_unref (connection);
> 
> 	check_startup_complete (self);
>+
>+	g_object_unref (self);       /* Balanced by a ref in claim_connection() */
> }
> 
> #define NM_DBUS_SERVICE_OPENCONNECT    "org.freedesktop.NetworkManager.openconnect"
> #define NM_OPENCONNECT_KEY_GATEWAY "gateway"
> #define NM_OPENCONNECT_KEY_COOKIE "cookie"
> #define NM_OPENCONNECT_KEY_GWCERT "gwcert"
> #define NM_OPENCONNECT_KEY_XMLCONFIG "xmlconfig"
> #define NM_OPENCONNECT_KEY_LASTHOST "lasthost"
>@@ -993,16 +995,21 @@ claim_connection (NMSettings *self, NMSettingsConnection *connection)
> 		g_signal_connect (connection, "notify::" NM_SETTINGS_CONNECTION_READY,
> 		                  G_CALLBACK (connection_ready_changed),
> 		                  self);
> 	}
> 
> 	_clear_connections_cached_list (priv);
> 
> 	g_object_ref (connection);
>+	/* The NMSettings instance can't be disposed while there is any
>+	 * exported connection. Ideally we should unexport all connections
>+	 * on NMSettings' disposal, but for now leak @self on termination
>+	 * when there are connections alive. */
>+	g_object_ref (self);
> 	priv->connections_len++;
> 	c_list_link_tail (&priv->connections_lst_head, &connection->_connections_lst);
> 
> 	path = nm_dbus_object_export (NM_DBUS_OBJECT (connection));
> 
> 	nm_utils_log_connection_diff (NM_CONNECTION (connection), NULL, LOGL_DEBUG, LOGD_CORE, "new connection", "++ ",
> 	                              path);
> 
>-- 
>2.17.0
>

Actions: View | Diff

Attachments on bug 1579858: 1438738 | 1446757