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

dhcp/systemd: fix leaking leases after dhcp_lease_load()

Browse source 
Fixes: d2dd3b2c90
(cherry picked from commit 9e52613612)
This commit is contained in:
Thomas Haller 2015-09-17 11:53:00 +02:00
parent 0aa99069ed
commit f05b42e6df
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dhcp-manager/nm-dhcp-systemd.c
View file

@ -393,10 +393,11 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
path = get_leasefile_path (iface, uuid, FALSE);
r = sd_dhcp_lease_load (&lease, path);
if (r == 0 && lease) {
if (r == 0) {
ip4_config = lease_to_ip4_config (lease, NULL, default_route_metric, FALSE, NULL);
if (ip4_config)
leases = g_slist_append (leases, ip4_config);
sd_dhcp_lease_unref (lease);
}
return leases;
@ -532,6 +533,7 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
struct in_addr last_addr = { 0 };
const char *hostname;
int r, i;
gboolean success = FALSE;
g_assert (priv->client4 == NULL);
g_assert (priv->client6 == NULL);
@ -618,8 +620,6 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
}
}
if (lease)
sd_dhcp_lease_unref (lease);
/* Add requested options */
for (i = 0; dhcp4_requests[i].name; i++) {
@ -642,12 +642,13 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
goto error;
}
return TRUE;
success = TRUE;
error:
sd_dhcp_client_unref (priv->client4);
priv->client4 = NULL;
return FALSE;
sd_dhcp_lease_unref (lease);
if (!success)
priv->client4 = sd_dhcp_client_unref (priv->client4);
return success;
}
static void