commit 53bcaedcae5df0c3e86d21a5b6e8c285215b678b
author Xin Li <delphij@google.com> Wed May 15 16:55:34 2019 -0700
committer Xin Li <delphij@google.com> Wed May 15 16:55:34 2019 -0700
tree 988e10cfa96267095717752097bd4c1492d5b4c6
parent 9a1bc365ed15b44ff9abf3cc74b7580544d3bc45
parent 7e7b2cc03eea260aec552142839ac0292d6d700c

DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.

Bug: 132622481
Change-Id: I5c2166d70ff6a1e49c9791932173c36b9e58eca7

wpa_supplicant/wnm_sta.c

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index 28346ea..3e27f0c 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -373,6 +373,10 @@
 		rep->preference_present = 1;
 		break;
 	case WNM_NEIGHBOR_BSS_TERMINATION_DURATION:
+		if (elen < 10) {
+			wpa_printf(MSG_DEBUG, "WNM: Too short bss_term_tsf");
+			break;
+		}
 		rep->bss_term_tsf = WPA_GET_LE64(pos);
 		rep->bss_term_dur = WPA_GET_LE16(pos + 8);
 		rep->bss_term_present = 1;