Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

prima: Drop assoc request if RSNIE/WPAIE parsing fail

Browse source 
Add changes to drop assoc request and return error if RSNIE or
WPAIE parsing fail during parsing of assoc request.

CRs-Fixed: 2046578
Change-Id: I88d779399c2eba5d33c30144bf9600a1f3a00b77
(cherry picked from commit aae237dfbaf8edcf310eeb84b887b20e7e9c0ff3)
This commit is contained in:
Kapil Gupta 2017-05-16 12:39:54 +05:30 committed by Sean McCreary
parent 65c3a34dbd
commit 4fa71edbf5
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
View file

@ -658,10 +658,18 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
if(pAssocReq->rsn.length)
{
// Unpack the RSN IE
dot11fUnpackIeRSN(pMac,
if (dot11fUnpackIeRSN(pMac,
&pAssocReq->rsn.info[0],
pAssocReq->rsn.length,
&Dot11fIERSN);
&Dot11fIERSN) != DOT11F_PARSE_SUCCESS)
{
limLog(pMac, LOG1,
FL("Invalid RSNIE received"));
limSendAssocRspMgmtFrame(pMac,
eSIR_MAC_INVALID_RSN_IE_CAPABILITIES_STATUS,
1, pHdr->sa, subType, 0,psessionEntry);
goto error;
}
/* Check RSN version is supported or not */
if(SIR_MAC_OUI_VERSION_1 == Dot11fIERSN.version)
@ -721,10 +729,17 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
// Unpack the WPA IE
if(pAssocReq->wpa.length)
{
dot11fUnpackIeWPA(pMac,
if (dot11fUnpackIeWPA(pMac,
&pAssocReq->wpa.info[4], //OUI is not taken care
pAssocReq->wpa.length,
&Dot11fIEWPA);
&Dot11fIEWPA) != DOT11F_PARSE_SUCCESS)
{
limLog(pMac, LOGE, FL("Invalid WPA IE"));
limSendAssocRspMgmtFrame(pMac,
eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS,
1, pHdr->sa, subType, 0,psessionEntry);
goto error;
}
/* check the groupwise and pairwise cipher suites */
if(eSIR_SUCCESS != (status = limCheckRxWPAIeMatch(pMac, Dot11fIEWPA, psessionEntry, pAssocReq->HTCaps.present)))
{