Merge tag 'LA.UM.9.6.2.c26-02500-89xx.0' into int/11/fp3
"LA.UM.9.6.2.c26-02500-89xx.0"
* tag 'LA.UM.9.6.2.c26-02500-89xx.0':
wlan: Fix array OOB for duplicate rate
qcacld-2.0: Fix array OOB for duplicate rate
wlan: Fix possible OOB in UnpackTlvCore
wlan: Fix possible OOB in unpack_tlv_core
wlan: Avoid OOB read in dot11f_unpack_assoc_response
Change-Id: I89cdd50061ccc210b60e1666a25c7a4916137234
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9b18837..ca1e7df 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8634,7 +8634,6 @@
/* after uninit our adapter structure will no longer be valid */
pAdapter->dev = NULL;
pAdapter->magic = 0;
- pAdapter->pHddCtx = NULL;
} while (0);
EXIT();
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index c776cfb..ac90ef6 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -5964,15 +5964,7 @@
frmAddBARsp.AddBAParameterSet.policy = pMlmAddBARsp->baPolicy;
frmAddBARsp.AddBAParameterSet.bufferSize = pMlmAddBARsp->baBufferSize;
- if(psessionEntry->isAmsduSupportInAMPDU)
- {
- frmAddBARsp.AddBAParameterSet.amsduSupported =
- psessionEntry->amsduSupportedInBA;
- }
- else
- {
- frmAddBARsp.AddBAParameterSet.amsduSupported = 0;
- }
+ frmAddBARsp.AddBAParameterSet.amsduSupported = 1;
// BA timeout
// 0 - indicates no BA timeout