commit eea2488f51e55ab5da909c92679845be2ef4929a
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Wed Dec 18 07:55:07 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Dec 18 07:55:07 2019 -0800
tree 0ba3ff79fcf78f43552f2e33a5a6b6eeb7cc34d3
parent 92dff6fc9b89e8b9487a035cebd77f4052c55ad6
parent 863e30574f78bcea311bd874ef30ba6101c7b663

Merge "wlan: Add max index check for dscp_to_up_map array" into wlan-driver.lnx.1.0

CORE/SME/inc/csrApi.h

diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 9fdc24d..c1ec650 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -365,11 +365,10 @@
 #endif
 
 #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
-#define CSR_DOT11F_IE_RSN_MAX_LEN   (114)  /*TODO: duplicate one in dot11f.h */
 
 typedef struct tagCsrEseCckmIe
 {
-    tANI_U8 cckmIe[CSR_DOT11F_IE_RSN_MAX_LEN];
+    tANI_U8 cckmIe[DOT11F_IE_RSN_MAX_LEN];
     tANI_U8 cckmIeLen;
 } tCsrEseCckmIe;
 #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */

CORE/SME/src/csr/csrUtil.c

diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index fa00158..f8f45e7 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -4226,6 +4226,8 @@
 
     smsLog(pMac, LOGW, "%s called...", __func__);
 
+    vos_mem_zero(&pmkid_cache, sizeof(pmkid_cache));
+
     do
     {
         if ( !csrIsProfileRSN( pProfile ) ) break;