Merge branch 'android-msm-barbet-4.19-sc-security' into android-msm-barbet-4.19-sc-v2

May 2022.1

Bug: 218985673
Change-Id: I66318f5a973e2c3b7086c3ce381dcb1d2c2370e0

core/mac/src/sys/legacy/src/utils/src/dot11f.c

diff --git a/core/mac/src/sys/legacy/src/utils/src/dot11f.c b/core/mac/src/sys/legacy/src/utils/src/dot11f.c
index 7195b5f..115d006 100644
--- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c
+++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c
@@ -335,7 +335,7 @@
 	len += *(pBufRemaining+1);
 	pBufRemaining += len + 2;
 	len += 2;
-	while (len < nBuf) {
+	while (len + 1 < nBuf) {
 		pIe = find_ie_defn(pCtx, pBufRemaining, nBuf - len, IEs);
 		if (NULL == pIe)
 			break;