From 43be97729b826739e58be20028f2526495ccf527 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 23 Nov 2020 16:04:35 +0100 Subject: core: fix modifying connection during recheck_assume_connection() Since commit d35d3c468a30 ('settings: rework tracking settings connections and settings plugins') must settings connections not be modified. They must be treated immutable and only updated by replacing them with a new variant. There is even an assertion for that. Fix the code that attempts to modify an existing NMConnection. https://bugzilla.redhat.com/show_bug.cgi?id=1900536 Fixes: f2fe6c03ee3f ('manager: don't treat the initramfs-configured DHCP connections as generated') --- src/nm-manager.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index c17c881b68..75117bbc63 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2879,15 +2879,20 @@ recheck_assume_connection(NMManager *self, NMDevice *device) activation_type_assume = TRUE; if (generated) { + gs_unref_object NMConnection *con2 = NULL; + + con2 = nm_simple_connection_new_clone( + nm_settings_connection_get_connection(sett_conn)); + /* Reset the IPv4 setting to empty method=auto, regardless of what assumption guessed. */ - nm_connection_add_setting(nm_settings_connection_get_connection(sett_conn), + nm_connection_add_setting(con2, g_object_new(NM_TYPE_SETTING_IP4_CONFIG, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL)); nm_settings_connection_update(sett_conn, - NULL, + con2, NM_SETTINGS_CONNECTION_PERSIST_MODE_KEEP, NM_SETTINGS_CONNECTION_INT_FLAGS_NONE, NM_SETTINGS_CONNECTION_INT_FLAGS_VOLATILE -- cgit v1.2.1