From b80a398306b3f30b3563df43141215e6645e652d Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 8 Aug 2023 13:53:50 +0200 Subject: [PATCH] checkpoint: fetch new device on rollback When a device belonging to a checkpoint is removed, we clear the device pointer from the DeviceCheckpoint and move the object from the devices list to the removed-devices list of the checkpoint. Later, when restoring the connection we need to set again the device pointer in DeviceCheckpoint; otherwise, any connection on that device can't be reactivated if changed. Fixes: 0e2f7ac7b5ea ('nm-checkpoint: drop reference to NM_DEVICE objects on removal signal') --- src/core/nm-checkpoint.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/core/nm-checkpoint.c b/src/core/nm-checkpoint.c index 52d8a649b3..5c4d4e53d6 100644 --- a/src/core/nm-checkpoint.c +++ b/src/core/nm-checkpoint.c @@ -259,17 +259,19 @@ restore_and_activate_connection(NMCheckpoint *self, DeviceCheckpoint *dev_checkp g_clear_error(&local_error); return FALSE; } - - /* If the device is software, a brand new NMDevice may have been created */ - if (dev_checkpoint->is_software && !dev_checkpoint->device) { - dev_checkpoint->device = nm_manager_get_device(priv->manager, - dev_checkpoint->original_dev_name, - dev_checkpoint->dev_type); - nm_g_object_ref(dev_checkpoint->device); - } need_activation = TRUE; } + /* If the device is software, a brand new NMDevice may have been created + * after adding the new connection; or the old device might have been + * deleted and we need to fetch it again. */ + if (dev_checkpoint->is_software && !dev_checkpoint->device) { + dev_checkpoint->device = nm_manager_get_device(priv->manager, + dev_checkpoint->original_dev_name, + dev_checkpoint->dev_type); + nm_g_object_ref(dev_checkpoint->device); + } + if (!dev_checkpoint->device) { _LOGD("rollback: device cannot be restored"); return FALSE;