From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Tue, 3 Jan 2017 12:58:14 +0000 (+0200)
Subject: Allow LCI request with no subelements
X-Git-Tag: hostap_2_7~1837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7187e2093000186988bdfc28c03b5c11c3e130a6;p=thirdparty%2Fhostap.git

Allow LCI request with no subelements

Allow shorter request since the subelements are optional to include.
Also print the hexdump of the subelements into debug log.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/wpa_supplicant/rrm.c b/wpa_supplicant/rrm.c
index 085d613d7..7a10a00fc 100644
--- a/wpa_supplicant/rrm.c
+++ b/wpa_supplicant/rrm.c
@@ -314,7 +314,7 @@ wpas_rrm_build_lci_report(struct wpa_supplicant *wpa_s,
 	const u8 *request = req->variable;
 	size_t len = req->len - 3;
 
-	if (len < 4)
+	if (len < 1)
 		return -1;
 
 	if (!wpa_s->lci)
@@ -333,6 +333,7 @@ wpas_rrm_build_lci_report(struct wpa_supplicant *wpa_s,
 	}
 
 	/* Subelements are formatted exactly like elements */
+	wpa_hexdump(MSG_DEBUG, "LCI request subelements", request, len);
 	subelem = get_ie(request, len, LCI_REQ_SUBELEM_MAX_AGE);
 	if (subelem && subelem[1] == 2)
 		max_age = WPA_GET_LE16(subelem + 2);