fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 08:10:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkpoint: Fix segfault crash when rollback

Browse source 
When rolling back a checkpoint, NM will crash due to dereference a NULL
pointer of `priv->removed_devices->len`.

To fix it, we just place a NULL check before that code block.

Fixes: 1f1b71ad9f ('checkpoint: preserve devices that were removed and
                      readded')

Reference: https://issues.redhat.com/browse/RHEL-1526

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2023-08-29 08:25:23 +08:00 • committed by Fernando Fernandez Mancera
parent 194b381d38
commit 3162507d6c
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/nm-checkpoint.c
View file

@ -460,24 +460,27 @@ next_dev:
NMDeviceState state;
nm_manager_for_each_device (priv->manager, device, tmp_lst) {
gboolean found = FALSE;
if (g_hash_table_contains(priv->devices, device))
continue;
/* Also ignore devices that were in the checkpoint initially and
* were moved to 'removed_devices' because they got removed from
* the system. */
for (i = 0; i < priv->removed_devices->len; i++) {
dev_checkpoint = priv->removed_devices->pdata[i];
if (dev_checkpoint->dev_type == nm_device_get_device_type(device)
&& nm_streq0(dev_checkpoint->original_dev_name, nm_device_get_iface(device))) {
found = TRUE;
break;
if (priv->removed_devices) {
gboolean found = FALSE;
for (i = 0; i < priv->removed_devices->len; i++) {
dev_checkpoint = priv->removed_devices->pdata[i];
if (dev_checkpoint->dev_type == nm_device_get_device_type(device)
&& nm_streq0(dev_checkpoint->original_dev_name,
nm_device_get_iface(device))) {
found = TRUE;
break;
}
}
if (found)
continue;
}
if (found)
continue;
state = nm_device_get_state(device);
if (state > NM_DEVICE_STATE_DISCONNECTED && state < NM_DEVICE_STATE_DEACTIVATING) {