From 285b898a044601cbe0ddc6e7a6993efc5c072ff0 Mon Sep 17 00:00:00 2001 From: bings Date: Wed, 6 Mar 2019 10:57:17 +0800 Subject: [PATCH] qcacld-3.0: Call dot11f_unpack_ie_rsn only for RSN IE In lim_send_mlm_assoc_ind, wpa information may be copied to rsnIEdata. So before calling dot11f_unpack_ie_rsn for rsnIEdata in the function csr_roam_chk_lnk_assoc_ind, make sure the element id is RSN IE. dot11f_unpack_ie_rsn returns failure for rsnIEdata if it contains WPA information, then WPA connection fails. Change-Id: I602a47326d452f33ba589a9cc99f59ce443d3162 CRs-Fixed: 2406444 --- core/sme/src/csr/csr_api_roam.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index c4dec053264d..6150469cc425 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -10980,7 +10980,8 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) if (!QDF_IS_STATUS_SUCCESS(status)) { /* Refused due to Mac filtering */ roam_info->statusCode = eSIR_SME_ASSOC_REFUSED; - } else if (pAssocInd->rsnIE.length) { + } else if (pAssocInd->rsnIE.length && SIR_MAC_RSN_EID == + pAssocInd->rsnIE.rsnIEdata[0]) { tDot11fIERSN rsn_ie = {0}; if (dot11f_unpack_ie_rsn(mac_ctx,