samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Parse IE from ASSOC_REQ_IE_OFFSET in assoc req

Browse Source 
Random failure is observed when trying to parse RSN IE from
assoc_ind->assocReqPtr in sap_fill_owe_ie_in_assoc_ind.
It should be parsed from ASSOC_REQ_IE_OFFSET.

Change-Id: I8f532f8850a7d997e0227a9e00d4285297243495
CRs-Fixed: 2408770
This commit is contained in:
Min Liu
2019-03-04 15:38:14 +08:00
committed by nshrivas
parent 5f863eec8d
commit 0daa786397
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/sap/src/sap_fsm.c
View File

@@ -1361,9 +1361,14 @@ static bool sap_fill_owe_ie_in_assoc_ind(tSap_StationAssocIndication *assoc_ind,
uint32_t owe_ie_len, rsn_ie_len, dh_ie_len; uint32_t owe_ie_len, rsn_ie_len, dh_ie_len;
const uint8_t *rsn_ie, *dh_ie; const uint8_t *rsn_ie, *dh_ie;
if (assoc_ind->assocReqLength < ASSOC_REQ_IE_OFFSET) {
QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid assoc req");
return false;
}
rsn_ie = wlan_get_ie_ptr_from_eid(DOT11F_EID_RSN, rsn_ie = wlan_get_ie_ptr_from_eid(DOT11F_EID_RSN,
assoc_ind->assocReqPtr, assoc_ind->assocReqPtr + ASSOC_REQ_IE_OFFSET,
assoc_ind->assocReqLength); assoc_ind->assocReqLength - ASSOC_REQ_IE_OFFSET);
if (!rsn_ie) { if (!rsn_ie) {
QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "RSN IE is not present"); QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "RSN IE is not present");
return false; return false;
@@ -1377,8 +1382,8 @@ static bool sap_fill_owe_ie_in_assoc_ind(tSap_StationAssocIndication *assoc_ind,
} }
dh_ie = wlan_get_ext_ie_ptr_from_ext_id(DH_OUI_TYPE, DH_OUI_TYPE_SIZE, dh_ie = wlan_get_ext_ie_ptr_from_ext_id(DH_OUI_TYPE, DH_OUI_TYPE_SIZE,
assoc_ind->assocReqPtr, assoc_ind->assocReqPtr + ASSOC_REQ_IE_OFFSET,
(uint16_t)assoc_ind->assocReqLength); (uint16_t)(assoc_ind->assocReqLength - ASSOC_REQ_IE_OFFSET));
if (!dh_ie) { if (!dh_ie) {
QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "DH IE is not present"); QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "DH IE is not present");
return false; return false;