colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: fix potential use-after-free resetting IPv6 accept_ra value

Browse Source
This commit is contained in:
Dan Williams
2010-06-30 13:37:34 -07:00
parent 4eea398b06
commit c38d1c28ff
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nm-device.c
View File

@@ -3332,13 +3332,6 @@ dispose (GObject *object)
addrconf6_cleanup (self); addrconf6_cleanup (self);
dnsmasq_cleanup (self); dnsmasq_cleanup (self);
/* reset the saved RA value */
if (priv->ip6_accept_ra_path) {
nm_utils_do_sysctl (priv->ip6_accept_ra_path,
priv->ip6_accept_ra_save ? "1\n" : "0\n");
}
g_free (priv->ip6_accept_ra_path);
/* Take the device itself down and clear its IPv4 configuration */ /* Take the device itself down and clear its IPv4 configuration */
if (priv->managed && take_down) { if (priv->managed && take_down) {
NMDeviceStateReason ignored = NM_DEVICE_STATE_REASON_NONE; NMDeviceStateReason ignored = NM_DEVICE_STATE_REASON_NONE;
@@ -3347,6 +3340,13 @@ dispose (GObject *object)
nm_device_set_ip4_config (self, NULL, FALSE, &ignored); nm_device_set_ip4_config (self, NULL, FALSE, &ignored);
} }
/* reset the saved RA value */
if (priv->ip6_accept_ra_path) {
nm_utils_do_sysctl (priv->ip6_accept_ra_path,
priv->ip6_accept_ra_save ? "1\n" : "0\n");
}
g_free (priv->ip6_accept_ra_path);
activation_source_clear (self, TRUE, AF_INET); activation_source_clear (self, TRUE, AF_INET);
activation_source_clear (self, TRUE, AF_INET6); activation_source_clear (self, TRUE, AF_INET6);