Merge cherrypicks of [5610460, 5610582, 5610249, 5610250, 5610113, 5610163, 5610980, 5610981, 5610982, 5610983, 5610984, 5610461, 5610462, 5610463, 5610464, 5610114, 5610076, 5610985, 5610986, 5610251, 5610583] into oc-m8-release
Change-Id: I910aadfb7765600ef5657151faa4f622b062c265
diff --git a/src/ap/wnm_ap.c b/src/ap/wnm_ap.c
index 7c4fde0..adb66c1 100644
--- a/src/ap/wnm_ap.c
+++ b/src/ap/wnm_ap.c
@@ -200,6 +200,13 @@
u8 *tfsreq_ie_end = NULL;
u16 tfsreq_ie_len = 0;
+ if (len < 1) {
+ wpa_printf(MSG_DEBUG,
+ "WNM: Ignore too short WNM-Sleep Mode Request from "
+ MACSTR, MAC2STR(addr));
+ return;
+ }
+
dialog_token = *pos++;
while (pos + 1 < frm + len) {
u8 ie_len = pos[1];