wlan: Missing error and info logs in PE connect path (Part 2)
Adding missing error and info logs for connect path in
SmeJoinReq, assoc req and assoc rsp
Change-Id: Ib284980c080efa3db122153ae6b553d3355f23b3
CRs-Fixed: 608925
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index d9cbaf6..05b1837 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1607,7 +1607,8 @@
pSmeJoinReq = vos_mem_malloc(nSize);
if ( NULL == pSmeJoinReq )
{
- limLog(pMac, LOGP, FL("call to AllocateMemory failed for pSmeJoinReq"));
+ limLog(pMac, LOGP, FL("call to AllocateMemory failed for "
+ "pSmeJoinReq"));
retCode = eSIR_SME_RESOURCES_UNAVAILABLE;
goto end;
}
@@ -1631,7 +1632,8 @@
{
if(peValidateBtJoinRequest(pMac)!= TRUE)
{
- limLog(pMac, LOGW, FL("Start Bss session not present::SME_JOIN_REQ in unexpected state"));
+ limLog(pMac, LOGW, FL("Start Bss session not present::"
+ "SME_JOIN_REQ in unexpected state"));
retCode = eSIR_SME_UNEXPECTED_REQ_RESULT_CODE;
psessionEntry = NULL;
goto end;
@@ -1643,14 +1645,18 @@
if((psessionEntry = peFindSessionByBssid(pMac,pSmeJoinReq->bssDescription.bssId,&sessionId)) != NULL)
{
- limLog(pMac, LOGE, FL("Session Already exists for given BSSID"));
+ limLog(pMac, LOGE, FL("Session(%d) Already exists for BSSID: "
+ MAC_ADDRESS_STR" in limSmeState = %X"),sessionId,
+ MAC_ADDR_ARRAY(pSmeJoinReq->bssDescription.bssId),
+ psessionEntry->limSmeState);
if(psessionEntry->limSmeState == eLIM_SME_LINK_EST_STATE)
{
// Received eWNI_SME_JOIN_REQ for same
// BSS as currently associated.
// Log the event and send success
- PELOGW(limLog(pMac, LOGW, FL("Received SME_JOIN_REQ for currently joined BSS"));)
+ PELOGW(limLog(pMac, LOGW, FL("Received SME_JOIN_REQ for "
+ "currently joined BSS"));)
/// Send Join success response to host
retCode = eSIR_SME_ALREADY_JOINED_A_BSS;
psessionEntry = NULL;
@@ -1658,6 +1664,8 @@
}
else
{
+ PELOGE(limLog(pMac, LOGE, FL("SME_JOIN_REQ not for"
+ "currently joined BSS"));)
retCode = eSIR_SME_REFUSED;
psessionEntry = NULL;
goto end;
@@ -1742,17 +1750,20 @@
if (cfgSetInt(pMac, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, psessionEntry->txBFIniFeatureEnabled)
!= eSIR_SUCCESS)
{
- limLog(pMac, LOGP, FL("could not set WNI_CFG_VHT_SU_BEAMFORMEE_CAP at CFG"));
+ limLog(pMac, LOGP, FL("could not set "
+ "WNI_CFG_VHT_SU_BEAMFORMEE_CAP at CFG"));
retCode = eSIR_LOGP_EXCEPTION;
goto end;
}
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED,
- "***__limProcessSmeJoinReq: txBFCsnValue=%d****", pSmeJoinReq->txBFCsnValue);
+ "***__limProcessSmeJoinReq: txBFCsnValue=%d****",
+ pSmeJoinReq->txBFCsnValue);
if (cfgSetInt(pMac, WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED, pSmeJoinReq->txBFCsnValue)
!= eSIR_SUCCESS)
{
- limLog(pMac, LOGP, FL("could not set WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED at CFG"));
+ limLog(pMac, LOGP, FL("could not set "
+ "WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED at CFG"));
retCode = eSIR_LOGP_EXCEPTION;
goto end;
}
@@ -1789,7 +1800,8 @@
/*Store Persona */
psessionEntry->pePersona = pSmeJoinReq->staPersona;
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
- FL("PE PERSONA=%d cbMode %u"), psessionEntry->pePersona, pSmeJoinReq->cbMode);
+ FL("PE PERSONA=%d cbMode %u"), psessionEntry->pePersona,
+ pSmeJoinReq->cbMode);
/* Copy the SSID from smejoinreq to session entry */
psessionEntry->ssId.length = pSmeJoinReq->ssId.length;
@@ -1825,7 +1837,8 @@
else
{
/* Throw an error and return and make sure to delete the session.*/
- limLog(pMac, LOGW, FL("received SME_JOIN_REQ with invalid bss type"));
+ limLog(pMac, LOGE, FL("received SME_JOIN_REQ with invalid"
+ " bss type %d"), psessionEntry->bssType);
retCode = eSIR_SME_INVALID_PARAMETERS;
goto end;
}
@@ -1846,7 +1859,8 @@
pMlmJoinReq = vos_mem_malloc(val);
if ( NULL == pMlmJoinReq )
{
- limLog(pMac, LOGP, FL("call to AllocateMemory failed for mlmJoinReq"));
+ limLog(pMac, LOGP, FL("call to AllocateMemory "
+ "failed for mlmJoinReq"));
return;
}
(void) vos_mem_set((void *) pMlmJoinReq, val, 0);
@@ -1895,13 +1909,16 @@
psessionEntry->maxTxPower = VOS_MIN( regMax, (localPowerConstraint) );
#endif
#if defined WLAN_VOWIFI_DEBUG
- limLog( pMac, LOGE, "Regulatory max = %d, local power constraint = %d, max tx = %d", regMax, localPowerConstraint, psessionEntry->maxTxPower );
+ limLog( pMac, LOGE, "Regulatory max = %d, local power constraint = %d,"
+ " max tx = %d", regMax, localPowerConstraint,
+ psessionEntry->maxTxPower );
#endif
if (pMac->lim.gLimCurrentBssUapsd)
{
pMac->lim.gUapsdPerAcBitmask = psessionEntry->pLimJoinReq->uapsdPerAcBitmask;
- limLog( pMac, LOG1, FL("UAPSD flag for all AC - 0x%2x"), pMac->lim.gUapsdPerAcBitmask);
+ limLog( pMac, LOG1, FL("UAPSD flag for all AC - 0x%2x"),
+ pMac->lim.gUapsdPerAcBitmask);
// resetting the dynamic uapsd mask
pMac->lim.gUapsdPerAcDeliveryEnableMask = 0;
@@ -1927,17 +1944,11 @@
psessionEntry->limSmeState = eLIM_SME_WT_JOIN_STATE;
MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState));
- PELOG1(limLog(pMac, LOG1, FL("SME JoinReq: SSID %d.%c%c%c%c%c%c"),
- psessionEntry->ssId.length,
- psessionEntry->ssId.ssId[0],
- psessionEntry->ssId.ssId[1],
- psessionEntry->ssId.ssId[2],
- psessionEntry->ssId.ssId[3],
- psessionEntry->ssId.ssId[4],
- psessionEntry->ssId.ssId[5]);
- limLog(pMac, LOG1, FL("Channel %d, BSSID "MAC_ADDRESS_STR),
- psessionEntry->currentOperChannel,
- MAC_ADDR_ARRAY(psessionEntry->bssId));)
+ limLog(pMac, LOG1, FL("SME JoinReq:Sessionid %d SSID len %d SSID : %s "
+ "Channel %d, BSSID "MAC_ADDRESS_STR), pMlmJoinReq->sessionId,
+ psessionEntry->ssId.length,psessionEntry->ssId.ssId,
+ psessionEntry->currentOperChannel,
+ MAC_ADDR_ARRAY(psessionEntry->bssId));
/* Indicate whether spectrum management is enabled*/
psessionEntry->spectrumMgtEnabled =
@@ -1950,7 +1961,8 @@
else
{
/* Received eWNI_SME_JOIN_REQ un expected state */
- limLog(pMac, LOGE, FL("received unexpected SME_JOIN_REQ in state %X"), pMac->lim.gLimSmeState);
+ limLog(pMac, LOGE, FL("received unexpected SME_JOIN_REQ "
+ "in state %X"), pMac->lim.gLimSmeState);
limPrintSmeState(pMac, LOGE, pMac->lim.gLimSmeState);
retCode = eSIR_SME_UNEXPECTED_REQ_RESULT_CODE;
psessionEntry = NULL;
@@ -1979,7 +1991,8 @@
psessionEntry = NULL;
}
}
-
+ limLog(pMac, LOG1, FL("Sending failure status limSendSmeJoinReassocRsp"
+ "on sessionid: %d with retCode = %d"),smesessionId, retCode);
limSendSmeJoinReassocRsp(pMac, eWNI_SME_JOIN_RSP, retCode, eSIR_MAC_UNSPEC_FAILURE_STATUS,psessionEntry,smesessionId,smetransactionId);
} /*** end __limProcessSmeJoinReq() ***/
@@ -2151,7 +2164,9 @@
psessionEntry->maxTxPower = VOS_MIN( regMax, (localPowerConstraint) );
#if defined WLAN_VOWIFI_DEBUG
- limLog( pMac, LOGE, "Regulatory max = %d, local power constraint = %d, max tx = %d", regMax, localPowerConstraint, psessionEntry->maxTxPower );
+ limLog( pMac, LOGE, "Regulatory max = %d, local power constraint "
+ "= %d, max tx = %d", regMax, localPowerConstraint,
+ psessionEntry->maxTxPower );
#endif
{
#if 0
@@ -2178,7 +2193,8 @@
if (pMac->lim.gLimCurrentBssUapsd)
{
pMac->lim.gUapsdPerAcBitmask = psessionEntry->pLimReAssocReq->uapsdPerAcBitmask;
- limLog( pMac, LOG1, FL("UAPSD flag for all AC - 0x%2x"), pMac->lim.gUapsdPerAcBitmask);
+ limLog( pMac, LOG1, FL("UAPSD flag for all AC - 0x%2x"),
+ pMac->lim.gUapsdPerAcBitmask);
}
pMlmReassocReq = vos_mem_malloc(sizeof(tLimMlmReassocReq));
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index b7ab35e..cc731c4 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -1218,6 +1218,7 @@
if(NULL == psessionEntry)
{
+ limLog( pMac, LOGE, FL("psessionEntry is NULL"));
return;
}
@@ -1371,7 +1372,8 @@
if (wlan_cfgGetInt(pMac, WNI_CFG_ASSOC_RSP_ADDNIE_FLAG,
&addnIEPresent) != eSIR_SUCCESS)
{
- limLog(pMac, LOGP, FL("Unable to get WNI_CFG_ASSOC_RSP_ADDNIE_FLAG"));
+ limLog(pMac, LOGP, FL("Unable to get "
+ "WNI_CFG_ASSOC_RSP_ADDNIE_FLAG"));
return;
}
@@ -1381,7 +1383,8 @@
if (wlan_cfgGetStrLen(pMac, WNI_CFG_ASSOC_RSP_ADDNIE_DATA,
&addnIELen) != eSIR_SUCCESS)
{
- limLog(pMac, LOGP, FL("Unable to get WNI_CFG_ASSOC_RSP_ADDNIE_DATA length"));
+ limLog(pMac, LOGP, FL("Unable to get "
+ "WNI_CFG_ASSOC_RSP_ADDNIE_DATA length"));
return;
}
@@ -1436,8 +1439,8 @@
nPayload, &nPayload );
if ( DOT11F_FAILED( nStatus ) )
{
- limLog( pMac, LOGE, FL("Failed to pack an Association Response (0x%08x)."),
- nStatus );
+ limLog( pMac, LOGE, FL("Failed to pack an Association Response"
+ " (0x%08x)."), nStatus );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
( void* ) pFrame, ( void* ) pPacket );
return; // allocated!
@@ -1975,17 +1978,14 @@
if(NULL == psessionEntry)
{
+ limLog(pMac, LOGE, FL("psessionEntry is NULL") );
return;
}
- if(NULL == psessionEntry->pLimJoinReq)
- {
- return;
- }
-
/* check this early to avoid unncessary operation */
if(NULL == psessionEntry->pLimJoinReq)
{
+ limLog(pMac, LOGE, FL("psessionEntry->pLimJoinReq is NULL") );
return;
}
nAddIELen = psessionEntry->pLimJoinReq->addIEAssoc.length;
@@ -1994,7 +1994,7 @@
pFrm = vos_mem_malloc(sizeof(tDot11fAssocRequest));
if ( NULL == pFrm )
{
- limLog(pMac, LOGE, FL("Unable to allocate memory in limSendAssocReqMgmtFrame") );
+ limLog(pMac, LOGE, FL("Unable to allocate memory") );
return;
}
@@ -2139,7 +2139,8 @@
if( (psessionEntry->pLimJoinReq != NULL) && (!psessionEntry->pLimJoinReq->bssDescription.aniIndicator))
{
- limLog( pMac, LOG1, FL("Sending Assoc Req to Non-TQ AP, Turning off Greenfield"));
+ limLog( pMac, LOG1, FL("Sending Assoc Req to Non-TQ AP,"
+ " Turning off Greenfield"));
pFrm->HTCaps.greenField = WNI_CFG_GREENFIELD_CAPABILITY_DISABLE;
}
#endif
@@ -2249,13 +2250,13 @@
}
- // That done, pack the Probe Request:
+ // That done, pack the Assoc Request:
nStatus = dot11fPackAssocRequest( pMac, pFrm, pFrame +
sizeof(tSirMacMgmtHdr),
nPayload, &nPayload );
if ( DOT11F_FAILED( nStatus ) )
{
- limLog( pMac, LOGE, FL("Failed to pack a Probe Response (0x%0"
+ limLog( pMac, LOGE, FL("Failed to pack a Assoc Request (0x%0"
"8x)."),
nStatus );
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
@@ -2265,8 +2266,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Response (0x%08x)."), nStatus );
+ limLog( pMac, LOGW, FL("There were warnings while packing a Assoc"
+ "Request (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Association Request length %d"
@@ -2291,7 +2292,8 @@
psessionEntry->assocReq = vos_mem_malloc(nPayload);
if ( NULL == psessionEntry->assocReq )
{
- PELOGE(limLog(pMac, LOGE, FL("Unable to allocate memory to store assoc request"));)
+ PELOGE(limLog(pMac, LOGE, FL("Unable to allocate memory to store "
+ "assoc request"));)
}
else
{
@@ -2312,7 +2314,6 @@
{
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
-
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) (sizeof(tSirMacMgmtHdr) + nPayload),
HAL_TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
@@ -3169,9 +3170,16 @@
if(NULL == psessionEntry)
{
+ limLog(pMac, LOGE, FL("Error: psession Entry is NULL"));
return;
}
-
+
+ limLog(pMac, LOG1,
+ FL("Sending Auth seq# %d status %d (%d) to "MAC_ADDRESS_STR),
+ pAuthFrameBody->authTransactionSeqNumber,
+ pAuthFrameBody->authStatusCode,
+ (pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
+ MAC_ADDR_ARRAY(peerMacAddr));
if (wepBit == LIM_WEP_IN_FC)
{
/// Auth frame3 to be sent with encrypted framebody
@@ -3214,7 +3222,8 @@
}
else
{
- limLog(pMac, LOG3, FL("Auth frame, Does not contain FTIES!!!"));
+ limLog(pMac, LOG3, FL("Auth frame, Does not contain "
+ "FTIES!!!"));
frameLen += (2+SIR_MDIE_SIZE);
}
}
@@ -3305,6 +3314,8 @@
if (limPopulateMacHeader(pMac, pFrame, SIR_MAC_MGMT_FRAME,
SIR_MAC_MGMT_AUTH, peerMacAddr,psessionEntry->selfMacAddr) != eSIR_SUCCESS)
{
+ limLog(pMac, LOGE, FL("call to limPopulateMacHeader failed for "
+ "AUTH frame"));
palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket );
return;
}
@@ -3328,11 +3339,11 @@
vos_mem_copy(pBody, (tANI_U8 *) pAuthFrameBody, bodyLen);
PELOG1(limLog(pMac, LOG1,
- FL("*** Sending Auth seq# 3 status %d (%d) to"),
+ FL("*** Sending Auth seq# 3 status %d (%d) to"MAC_ADDRESS_STR),
pAuthFrameBody->authStatusCode,
- (pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS));
+ (pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
+ MAC_ADDR_ARRAY(pMacHdr->da));)
- limPrintMacAddr(pMac, pMacHdr->da, LOG1);)
}
else
{
@@ -3391,12 +3402,11 @@
#endif
PELOG1(limLog(pMac, LOG1,
- FL("*** Sending Auth seq# %d status %d (%d) to "),
+ FL("*** Sending Auth seq# %d status %d (%d) to "MAC_ADDRESS_STR),
pAuthFrameBody->authTransactionSeqNumber,
pAuthFrameBody->authStatusCode,
- (pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS));
-
- limPrintMacAddr(pMac, pMacHdr->da, LOG1);)
+ (pAuthFrameBody->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
+ MAC_ADDR_ARRAY(pMacHdr->da));)
}
PELOG2(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG2, pFrame, frameLen);)
diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.c b/CORE/MAC/src/pe/lim/limSerDesUtils.c
index 1e50438..5a6d313 100644
--- a/CORE/MAC/src/pe/lim/limSerDesUtils.c
+++ b/CORE/MAC/src/pe/lim/limSerDesUtils.c
@@ -866,7 +866,7 @@
if (!pJoinReq || !pBuf)
{
- PELOGE(limLog(pMac, LOGE, FL("NULL ptr received"));)
+ PELOGE(limLog(pMac, LOGE, FL("pJoinReq or pBuf is NULL"));)
return eSIR_FAILURE;
}
@@ -881,32 +881,40 @@
if (pJoinReq->messageType == eWNI_SME_JOIN_REQ)
PELOG1(limLog(pMac, LOG3, FL("SME_JOIN_REQ length %d bytes is:"), len);)
else
- PELOG1(limLog(pMac, LOG3, FL("SME_REASSOC_REQ length %d bytes is:"), len);)
+ PELOG1(limLog(pMac, LOG3, FL("SME_REASSOC_REQ length %d bytes is:"),
+ len);)
PELOG1(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG3, pTemp, len);)
if (len < (tANI_S16) sizeof(tANI_U32))
{
- PELOGE(limLog(pMac, LOGE, FL("len too short %d"), len);)
+ PELOGE(limLog(pMac, LOGE, FL("len %d is too short"), len);)
return eSIR_FAILURE;
}
len -= sizeof(tANI_U32); // skip message header
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
-
+ }
// Extract sessionId
pJoinReq->sessionId = *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
-
+ }
// Extract transactionId
pJoinReq->transactionId = limGetU16(pBuf);
pBuf += sizeof(tANI_U16);
len -= sizeof(tANI_U16);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract ssId
pJoinReq->ssId.length = *pBuf++;
@@ -915,45 +923,66 @@
pBuf += pJoinReq->ssId.length;
len -= pJoinReq->ssId.length;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract selfMacAddr
vos_mem_copy( pJoinReq->selfMacAddr, pBuf, sizeof(tSirMacAddr));
pBuf += sizeof(tSirMacAddr);
len -= sizeof(tSirMacAddr);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract bsstype
pJoinReq->bsstype = (tSirBssType) limGetU32(pBuf);
pBuf += sizeof(tANI_U32);
len -= sizeof(tANI_U32);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract dot11mode
pJoinReq->dot11mode= *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract bssPersona
pJoinReq->staPersona = *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract cbMode
pJoinReq->cbMode = *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract uapsdPerAcBitmask
pJoinReq->uapsdPerAcBitmask = *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
// Extract operationalRateSet
@@ -966,7 +995,10 @@
pBuf += pJoinReq->operationalRateSet.numRates;
len -= pJoinReq->operationalRateSet.numRates;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
}
// Extract extendedRateSet
@@ -978,7 +1010,10 @@
pBuf += pJoinReq->extendedRateSet.numRates;
len -= pJoinReq->extendedRateSet.numRates;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
}
// Extract RSN IE
@@ -1002,7 +1037,10 @@
pBuf += pJoinReq->rsnIE.length;
len -= pJoinReq->rsnIE.length; // skip RSN IE
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
}
#ifdef FEATURE_WLAN_CCX
@@ -1026,7 +1064,10 @@
pBuf += pJoinReq->cckmIE.length;
len -= pJoinReq->cckmIE.length; // skip CCKM IE
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
}
#endif
@@ -1051,7 +1092,10 @@
pBuf += pJoinReq->addIEScan.length;
len -= pJoinReq->addIEScan.length; // skip add IE
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
}
pJoinReq->addIEAssoc.length = limGetU16(pBuf);
@@ -1075,27 +1119,38 @@
pBuf += pJoinReq->addIEAssoc.length;
len -= pJoinReq->addIEAssoc.length; // skip add IE
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
}
pJoinReq->UCEncryptionType = limGetU32(pBuf);
pBuf += sizeof(tANI_U32);
len -= sizeof(tANI_U32);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
+ return eSIR_FAILURE;
+ }
pJoinReq->MCEncryptionType = limGetU32(pBuf);
pBuf += sizeof(tANI_U32);
len -= sizeof(tANI_U32);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
-
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
+ return eSIR_FAILURE;
+ }
#ifdef WLAN_FEATURE_11W
pJoinReq->MgmtEncryptionType = limGetU32(pBuf);
pBuf += sizeof(tANI_U32);
len -= sizeof(tANI_U32);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
@@ -1104,7 +1159,10 @@
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
+ return eSIR_FAILURE;
+ }
#endif
#ifdef FEATURE_WLAN_CCX
@@ -1113,14 +1171,20 @@
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
//isCCXconnection;
pJoinReq->isCCXconnection = (tAniBool)limGetU32(pBuf);
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
+ return eSIR_FAILURE;
+ }
// TSPEC information
pJoinReq->ccxTspecInfo.numTspecs = *pBuf++;
@@ -1130,7 +1194,10 @@
pBuf += sizeof(tTspecInfo)*SIR_CCX_MAX_TSPEC_IES;
len -= sizeof(tTspecInfo)*SIR_CCX_MAX_TSPEC_IES;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
#endif
#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
@@ -1139,7 +1206,10 @@
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
+ return eSIR_FAILURE;
+ }
#endif
#ifdef FEATURE_WLAN_LFR
@@ -1148,31 +1218,46 @@
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
+ return eSIR_FAILURE;
+ }
#endif
//txLdpcIniFeatureEnabled
pJoinReq->txLdpcIniFeatureEnabled= *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
//txBFIniFeatureEnabled
pJoinReq->txBFIniFeatureEnabled= *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
//txBFCsnValue
pJoinReq->txBFCsnValue= *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
pJoinReq->isAmsduSupportInAMPDU= *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
pJoinReq->isWMEenabled = (tAniBool)limGetU32(pBuf);
pBuf += sizeof(tAniBool);
@@ -1203,7 +1288,6 @@
pJoinReq->powerCap.minTxPower = *pBuf++;
pJoinReq->powerCap.maxTxPower = *pBuf++;
len -=2;
- limLog(pMac, LOG1, FL("Power Caps: Min power = %d, Max power = %d"), pJoinReq->powerCap.minTxPower, pJoinReq->powerCap.maxTxPower);
pJoinReq->supportedChannels.numChnl = *pBuf++;
len--;
@@ -1222,7 +1306,10 @@
pJoinReq->uapsdPerAcBitmask = *pBuf++;
len--;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
+ {
+ limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
return eSIR_FAILURE;
+ }
//
// NOTE - tSirBssDescription is now moved to the end
@@ -1235,7 +1322,9 @@
PELOGE(limLog(pMac, LOGE, FL("get bss description failed"));)
return eSIR_FAILURE;
}
- PELOG3(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG3, (tANI_U8 *) &(pJoinReq->bssDescription), pJoinReq->bssDescription.length + 2);)
+ PELOG3(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG3,
+ (tANI_U8 *) &(pJoinReq->bssDescription),
+ pJoinReq->bssDescription.length + 2);)
pBuf += lenUsed;
len -= lenUsed;