From: Jouni Malinen <j@w1.fi>
Date: Sat, 4 Sep 2010 18:50:12 +0000 (+0300)
Subject: wpa_supplicant AP: Make sure deauth/disassoc event is valid
X-Git-Tag: hostap-1-bp~1204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f5420691e45cf1f1facd3baafa58c324819a868;p=thirdparty%2Fhostap.git

wpa_supplicant AP: Make sure deauth/disassoc event is valid

Verify that the driver wrapper is using a valid deauth/disassoc
event before dereferencing the addr pointer. The address is required
to be set in AP mode, but it is safer to verify this here than to
trust on all driver wrappers doing the correct thing.
---

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index ef2cd4529..54f05e564 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1500,7 +1500,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 					   MAC2STR(data->disassoc_info.addr));
 		}
 #ifdef CONFIG_AP
-		if (wpa_s->ap_iface && data) {
+		if (wpa_s->ap_iface && data && data->disassoc_info.addr) {
 			hostapd_notif_disassoc(wpa_s->ap_iface->bss[0],
 					       data->disassoc_info.addr);
 			break;
@@ -1527,7 +1527,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 			}
 		}
 #ifdef CONFIG_AP
-		if (wpa_s->ap_iface && data) {
+		if (wpa_s->ap_iface && data && data->deauth_info.addr) {
 			hostapd_notif_disassoc(wpa_s->ap_iface->bss[0],
 					       data->deauth_info.addr);
 			break;