Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41eb26ce authored by Gu xiaocong's avatar Gu xiaocong Committed by android-t1
Browse files

Integrate-security-patch-2021-07-05-CVE-2021-1955 

Change-Id: Id5d8ae551f62b3cb71beb4d1c9bb2b4dd97801ea
parent 925ff8ba

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

+6 −6
Original line number Diff line number Diff line
@@ -2960,7 +2960,7 @@ bool lim_fill_lim_assoc_ind_params( 
	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 @@ QDF_STATUS lim_send_mlm_assoc_ind(struct mac_context *mac_ctx, 


	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 @@ QDF_STATUS lim_send_mlm_assoc_ind(struct mac_context *mac_ctx, 


	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 @@ QDF_STATUS lim_send_mlm_assoc_ind(struct mac_context *mac_ctx, 
		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;

}

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

+1 −8
Original line number Diff line number Diff line
@@ -1941,14 +1941,7 @@ void lim_process_ap_mlm_add_sta_rsp(struct mac_context *mac, 
	 * 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) {

core/mac/src/pe/lim/lim_types.h

+3 −5
Original line number Diff line number Diff line
@@ -456,12 +456,10 @@ lim_fill_sme_assoc_ind_params( 
 * 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,

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 *);

/*