From: Masashi Honma <masashi.honma@gmail.com>
Date: Sat, 15 Nov 2014 01:35:29 +0000 (+0900)
Subject: mesh: Fix segmentation fault by repeating MESH_GROUP_ADD/REMOVE
X-Git-Tag: hostap_2_4~1145
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=eac02316421dd27bd3b938bef6ff91a22fa42fc7

mesh: Fix segmentation fault by repeating MESH_GROUP_ADD/REMOVE

Signed-off-by: Natsuki Itaya <Natsuki.Itaya@jp.sony.com>
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 6761c1a..c1684bf 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -3475,9 +3475,13 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 #endif /* CONFIG_AP */
 		break;
 	case EVENT_NEW_PEER_CANDIDATE:
+#ifdef CONFIG_MESH
+		if (!wpa_s->ifmsh || !data)
+			break;
 		wpa_mesh_notify_peer(wpa_s, data->mesh_peer.peer,
 				     data->mesh_peer.ies,
 				     data->mesh_peer.ie_len);
+#endif /* CONFIG_MESH */
 		break;
 	default:
 		wpa_msg(wpa_s, MSG_INFO, "Unknown event %d", event);