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

device: fix memory leak

Browse source 
l3cd instances must be removed from the old l3cfg before calling
_cleanup_ip_pre(). Otherwise, _cleanup_ip_pre() unregisters them from
the device, and later _dev_l3_register_l3cds(self, l3cfg_old, FALSE,
FALSE) does nothing because the device doesn't have any l3cd.

Previously the l3cds would linger in the l3cfg, keeping a reference to
it and causing a memory leak; the leak was not detected by valgrind
because the l3cfg was still referenced by the NMNetns.

Fixes: 58287cbcc0 ('core: rework IP configuration in NetworkManager using layer 3 configuration')
Fixes-test: @stable_mem_consumption2

https://bugzilla.redhat.com/show_bug.cgi?id=2083453

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1252
(cherry picked from commit f69a1cc874)
(cherry picked from commit 83ee0f0779)
This commit is contained in:
Beniamino Galvani 2022-06-07 23:15:47 +02:00
parent b0a7dda2ea
commit a0f34b3f92
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/devices/nm-device.c
View file

@ -4021,7 +4021,6 @@ _set_ifindex(NMDevice *self, int ifindex, gboolean is_ip_ifindex)
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
gs_unref_object NML3Cfg *l3cfg_old = NULL;
NML3CfgCommitTypeHandle *l3cfg_commit_type_old = NULL;
gboolean l3_changed;
int ip_ifindex_new;
int *p_ifindex;
gboolean l3cfg_was_reset = FALSE;
@ -4062,6 +4061,10 @@ _set_ifindex(NMDevice *self, int ifindex, gboolean is_ip_ifindex)
l3cfg_was_reset = TRUE;
}
}
if (!priv->l3cfg && l3cfg_old)
_dev_l3_register_l3cds(self, l3cfg_old, FALSE, FALSE);
if (!priv->l3cfg && ip_ifindex_new > 0) {
priv->l3cfg_ = nm_netns_l3cfg_acquire(priv->netns, ip_ifindex_new);
@ -4073,6 +4076,7 @@ _set_ifindex(NMDevice *self, int ifindex, gboolean is_ip_ifindex)
_dev_l3_cfg_commit_type_reset(self);
l3cfg_was_reset = TRUE;
}
if (!priv->l3cfg) {
_cleanup_ip_pre(self, AF_INET, CLEANUP_TYPE_KEEP, FALSE);
_cleanup_ip_pre(self, AF_INET6, CLEANUP_TYPE_KEEP, FALSE);
@ -4113,11 +4117,7 @@ _set_ifindex(NMDevice *self, int ifindex, gboolean is_ip_ifindex)
_notify(self, PROP_IP6_CONFIG);
}
if (l3cfg_old != priv->l3cfg) {
l3_changed = FALSE;
if (_dev_l3_register_l3cds(self, l3cfg_old, FALSE, FALSE))
l3_changed = TRUE;
if (priv->l3cfg && l3cfg_old != priv->l3cfg) {
/* Now it gets ugly. We changed the ip-ifindex, which determines the NML3Cfg instance.
* But all the NML3ConfigData we currently track are still for the old ifindex. We
* need to update them.
@ -4126,12 +4126,10 @@ _set_ifindex(NMDevice *self, int ifindex, gboolean is_ip_ifindex)
* associated with one ifindex (and not the ifindex/ip-ifindex split). Or it
* is not at all associated with an ifindex, but only a controlling device for
* a real NMDevice (that has the ifindex). */
_dev_l3_update_l3cds_ifindex(self);
if (_dev_l3_register_l3cds(self, priv->l3cfg, TRUE, FALSE))
l3_changed = TRUE;
if (l3_changed)
_dev_l3_cfg_commit(self, TRUE);
}