From: Jouni Malinen <j@w1.fi>
Date: Thu, 8 Jan 2015 00:13:46 +0000 (+0200)
Subject: Fix hostapd interface addition error path
X-Git-Tag: hostap_2_4~506
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1c07dcb702ab6d79c8abe28f452b92956ee508c;p=thirdparty%2Fhostap.git

Fix hostapd interface addition error path

The local conf pointer needs to be cleared once it gets assigned to
hapd_iface to avoid double-free of the configuration data on error path.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index b4a6a964d..6e4169ba9 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -2028,11 +2028,13 @@ int hostapd_add_iface(struct hapd_interfaces *interfaces, char *buf)
 			   "for hostapd", __func__);
 		goto fail;
 	}
+	conf = NULL;
 
 	if (start_ctrl_iface(hapd_iface) < 0)
 		goto fail;
 
-	wpa_printf(MSG_INFO, "Add interface '%s'", conf->bss[0]->iface);
+	wpa_printf(MSG_INFO, "Add interface '%s'",
+		   hapd_iface->conf->bss[0]->iface);
 
 	return 0;