Integrate-security-patch-2021-07-05-CVE-2021-1955
Change-Id: Id5d8ae551f62b3cb71beb4d1c9bb2b4dd97801ea
diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
index aa746d9..aefee29 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
@@ -2960,7 +2960,7 @@
return true;
}
-QDF_STATUS lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
+void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
tpDphHashNode sta_ds,
struct pe_session *session_entry)
{
@@ -2972,7 +2972,7 @@
if (!session_entry->parsedAssocReq) {
pe_err(" Parsed Assoc req is NULL");
- return QDF_STATUS_E_INVAL;
+ return;
}
/* Get a copy of the already parsed Assoc Request */
@@ -2981,7 +2981,7 @@
if (!assoc_req) {
pe_err("assoc req for assoc_id:%d is NULL", sta_ds->assocId);
- return QDF_STATUS_E_INVAL;
+ return;
}
/* Get the phy_mode */
@@ -3005,17 +3005,17 @@
if (!assoc_ind) {
lim_release_peer_idx(mac_ctx, sta_ds->assocId,
session_entry);
- return QDF_STATUS_E_INVAL;
+ return;
}
if (!lim_fill_lim_assoc_ind_params(assoc_ind, mac_ctx,
sta_ds, session_entry)) {
qdf_mem_free(assoc_ind);
- return QDF_STATUS_E_INVAL;
+ return;
}
lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_IND,
(uint32_t *)assoc_ind);
qdf_mem_free(assoc_ind);
}
- return QDF_STATUS_SUCCESS;
+ return;
}
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 7621d0a..6909b63 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -1941,14 +1941,7 @@
* 2) PE receives eWNI_SME_ASSOC_CNF from SME
* 3) BTAMP-AP sends Re/Association Response to BTAMP-STA
*/
- if (lim_send_mlm_assoc_ind(mac, sta, pe_session) != QDF_STATUS_SUCCESS)
- lim_reject_association(mac, sta->staAddr,
- sta->mlmStaContext.subType,
- true, sta->mlmStaContext.authType,
- sta->assocId, true,
- eSIR_MAC_UNSPEC_FAILURE_STATUS,
- pe_session);
-
+ lim_send_mlm_assoc_ind(mac, sta, pe_session);
/* fall though to reclaim the original Add STA Response message */
end:
if (0 != limMsgQ->bodyptr) {
diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h
index a2f2939..aa5c4fa 100644
--- a/core/mac/src/pe/lim/lim_types.h
+++ b/core/mac/src/pe/lim/lim_types.h
@@ -456,12 +456,10 @@
* This function sends either LIM_MLM_ASSOC_IND
* or LIM_MLM_REASSOC_IND to SME.
*
- * Return: QDF_STATUS
+ * Return: None
*/
-QDF_STATUS lim_send_mlm_assoc_ind(struct mac_context *mac,
- tpDphHashNode sta,
- struct pe_session *pe_session);
-
+void lim_send_mlm_assoc_ind(struct mac_context *mac, tpDphHashNode sta,
+ struct pe_session *pe_session);
void lim_process_assoc_rsp_frame(struct mac_context *, uint8_t *, uint8_t, struct pe_session *);
void lim_process_disassoc_frame(struct mac_context *, uint8_t *, struct pe_session *);
/*