diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2018-08-13 09:15:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-13 09:15:44 -0700 |
| commit | 48055d3fcc6eee7e7ecc950e56225e5d18d13b37 (patch) | |
| tree | 54059511eb1f16663c9f106d8fdff8aaca6f2218 | |
| parent | f1d2db8bb559e74d044da5fc587a23becde1ca3a (diff) | |
| parent | 3e093b32e37cc63a5f2be5ecc2cadcc2ac6d6c7e (diff) | |
Merge "qcacld-2.0: Reject non-RSN/WPA Assoc request" into wlan-cld2.driver.lnx.1.0
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c index 34c6dd2cd7d9..16966f528b9b 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -745,7 +745,8 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, psessionEntry->pLimStartBssReq->privacy && psessionEntry->pLimStartBssReq->rsnIE.length) { limLog(pMac, LOG1, - FL("RSN enabled auth, Re/Assoc req from STA: "MAC_ADDRESS_STR), + FL("RSN enabled auth, peer(%d, %d) Re/Assoc req from STA: "MAC_ADDRESS_STR), + pAssocReq->rsnPresent,pAssocReq->rsn.length, MAC_ADDR_ARRAY(pHdr->sa)); if(pAssocReq->rsnPresent) { @@ -823,9 +824,7 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, goto error; } - } /* end - if(pAssocReq->rsnPresent) */ - if((!pAssocReq->rsnPresent) && pAssocReq->wpaPresent) - { + } else if (pAssocReq->wpaPresent) { // Unpack the WPA IE if(pAssocReq->wpa.length) { @@ -872,7 +871,14 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, goto error; }/* end - if(pAssocReq->wpa.length) */ - } /* end - if(pAssocReq->wpaPresent) */ + } else { + limLog(pMac, LOG1, + FL("Non RSNIE and WPA IE received")); + limSendAssocRspMgmtFrame(pMac, + eSIR_MAC_INVALID_RSN_IE_CAPABILITIES_STATUS, + 1, pHdr->sa, subType, 0,psessionEntry); + goto error; + } } /* end of if(psessionEntry->pLimStartBssReq->privacy && psessionEntry->pLimStartBssReq->rsnIE->length) */ |