From: Jouni Malinen <j@w1.fi>
Date: Sat, 19 Oct 2013 10:08:37 +0000 (+0300)
Subject: eapol_test: Initialize wpa_s->global to fix ctrl_iface
X-Git-Tag: hostap_2_1~837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94de082b39037a7877c61478d4efbcb5155d73ff;p=thirdparty%2Fhostap.git

eapol_test: Initialize wpa_s->global to fix ctrl_iface

wpa_s->global is now dereferenced in number of places and at least one
of them hits in eapol_test cases. Fix issues with this by setting the
global pointer to empty data.

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

diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c
index dad27654e..a8b617e68 100644
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
@@ -1094,6 +1094,7 @@ static void usage(void)
 
 int main(int argc, char *argv[])
 {
+	struct wpa_global global;
 	struct wpa_supplicant wpa_s;
 	int c, ret = 1, wait_for_monitor = 0, save_config = 0;
 	char *as_addr = "127.0.0.1";
@@ -1230,7 +1231,9 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
+	os_memset(&global, 0, sizeof(global));
 	os_memset(&wpa_s, 0, sizeof(wpa_s));
+	wpa_s.global = &global;
 	eapol_test.wpa_s = &wpa_s;
 	wpa_s.conf = wpa_config_read(conf, NULL);
 	if (wpa_s.conf == NULL) {