From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Thu, 29 Jul 2010 23:09:38 +0000 (-0700)
Subject: P2P: Fix P2P IE generation for AssocReq when BSS info is not available
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libeap.git;a=commitdiff_plain;h=e1f1509bb0cdeb00d791eb027ae0fa9da4f6f7bd

P2P: Fix P2P IE generation for AssocReq when BSS info is not available

This code could segfault on NULL pointer dereference at least when
ap_scan=2 is used.
---

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 8b1d5c4..93c23e3 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -3019,6 +3019,8 @@ int wpas_p2p_assoc_req_ie(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
 		return -1;
 	if (wpa_s->global->p2p == NULL)
 		return -1;
+	if (bss == NULL)
+		return -1;
 
 	p2p_ie = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
 	ret = p2p_assoc_req_ie(wpa_s->global->p2p, bss->bssid, buf, len,