From 72063064567312ff6412c6d9996e8a6684df3f1d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 7 Nov 2013 21:30:25 -0600 Subject: [PATCH] core: fix hanlding of IPv6LL address if interface already has one act_stage3_ip6_config_start() expects a non-NULL NMIP6Config if the sub-method returns NM_ACT_STAGE_RETURN_SUCCESS. --- src/devices/nm-device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 6bf8a32ea5..d4830d74b9 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3444,6 +3444,11 @@ act_stage3_ip6_config_start (NMDevice *self, ret = NM_ACT_STAGE_RETURN_POSTPONE; } else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0) { ret = linklocal6_start (self); + if (ret == NM_ACT_STAGE_RETURN_SUCCESS) { + /* New blank config; LL address is already in priv->ext_ip6_config */ + *out_config = nm_ip6_config_new (); + g_assert (*out_config); + } } else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) == 0) { /* Router advertisements shouldn't be used in pure DHCP mode */ if (priv->ip6_accept_ra_path)