wlan: fix static analysis issues in HDD files
Fix static analysis issues reported in following files:
prima/CORE/HDD/src/wlan_hdd_main.c
prima/CORE/HDD/src/wlan_hdd_tx_rx.c
prima/CORE/HDD/src/wlan_hdd_wext.c
prima/CORE/HDD/src/wlan_hdd_wmm.c
prima/CORE/HDD/src/wlan_hdd_wowl.c
prima/CORE/SME/src/pmc/pmcApi.c
Change-Id: Ib17858f23478b94b297a955e3cfddb4d3dfda042
CRs-Fixed: 609611
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 509d4b4..91a97b0 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -367,7 +367,7 @@
v_UINT_t arg1, v_UINT_t arg2, v_UINT_t arg3);
#ifdef WLAN_FEATURE_PACKET_FILTERING
-int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest,
+int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest,
v_U8_t sessionId);
#endif
@@ -4252,7 +4252,7 @@
case WE_SET_TM_LEVEL:
{
hdd_context_t *hddCtxt = WLAN_HDD_GET_CTX(pAdapter);
- hddLog(VOS_TRACE_LEVEL_INFO, "Set Thermal Mitigation Level %d", (int)set_value);
+ hddLog(VOS_TRACE_LEVEL_INFO, "Set Thermal Mitigation Level %d", (int)set_value);
hddDevTmLevelChangedHandler(hddCtxt->parent_dev, set_value);
break;
@@ -4551,7 +4551,17 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
int sub_cmd = wrqu->data.flags;
#ifdef WLAN_FEATURE_11W
- hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
+ hdd_wext_state_t *pWextState;
+#endif
+
+ if (pAdapter == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: pAdapter is NULL!", __func__);
+ return -EINVAL;
+ }
+#ifdef WLAN_FEATURE_11W
+ pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
#endif
if (NULL == WLAN_HDD_GET_CTX(pAdapter))
@@ -4692,9 +4702,9 @@
int count = 0, check = 1;
tANI_U16 tlState;
- tHalHandle hHal;
- tpAniSirGlobal pMac;
- hdd_station_ctx_t *pHddStaCtx;
+ tHalHandle hHal = NULL;
+ tpAniSirGlobal pMac = NULL;
+ hdd_station_ctx_t *pHddStaCtx = NULL;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX( pAdapter );
hdd_adapter_t *useAdapter = NULL;
@@ -4738,7 +4748,19 @@
}
hHal = WLAN_HDD_GET_HAL_CTX( useAdapter );
+ if (!hHal) {
+ buf = scnprintf(extra + len, WE_MAX_STR_LEN - len,
+ "\n pMac is NULL");
+ len += buf;
+ break;
+ }
pMac = PMAC_STRUCT( hHal );
+ if (!pMac) {
+ buf = scnprintf(extra + len, WE_MAX_STR_LEN - len,
+ "\n pMac is NULL");
+ len += buf;
+ break;
+ }
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR( useAdapter );
if( !pHddStaCtx )
{
@@ -4772,36 +4794,38 @@
adapter_num++;
}
- /* Printing Lim State starting with global lim states */
- buf = scnprintf(extra + len, WE_MAX_STR_LEN - len,
- "\n \n LIM STATES:-"
- "\n Global Sme State - %s "\
- "\n Global mlm State - %s "\
- "\n",
- macTraceGetLimSmeState(pMac->lim.gLimSmeState),
- macTraceGetLimMlmState(pMac->lim.gLimMlmState)
- );
- len += buf;
+ if (pMac) {
+ /* Printing Lim State starting with global lim states */
+ buf = scnprintf(extra + len, WE_MAX_STR_LEN - len,
+ "\n \n LIM STATES:-"
+ "\n Global Sme State - %s "\
+ "\n Global mlm State - %s "\
+ "\n",
+ macTraceGetLimSmeState(pMac->lim.gLimSmeState),
+ macTraceGetLimMlmState(pMac->lim.gLimMlmState)
+ );
+ len += buf;
- /*printing the PE Sme and Mlm states for valid lim sessions*/
- while ( check < 3 && count < 255)
- {
- if ( pMac->lim.gpSession[count].valid )
+ /*printing the PE Sme and Mlm states for valid lim sessions*/
+ while ( check < 3 && count < 255)
{
- buf = scnprintf(extra + len, WE_MAX_STR_LEN - len,
- "\n Lim Valid Session %d:-"
- "\n PE Sme State - %s "
- "\n PE Mlm State - %s "
- "\n",
- check,
- macTraceGetLimSmeState(pMac->lim.gpSession[count].limSmeState),
- macTraceGetLimMlmState(pMac->lim.gpSession[count].limMlmState)
- );
+ if ( pMac->lim.gpSession[count].valid )
+ {
+ buf = scnprintf(extra + len, WE_MAX_STR_LEN - len,
+ "\n Lim Valid Session %d:-"
+ "\n PE Sme State - %s "
+ "\n PE Mlm State - %s "
+ "\n",
+ check,
+ macTraceGetLimSmeState(pMac->lim.gpSession[count].limSmeState),
+ macTraceGetLimMlmState(pMac->lim.gpSession[count].limMlmState)
+ );
- len += buf;
- check++;
+ len += buf;
+ check++;
+ }
+ count++;
}
- count++;
}
wrqu->data.length = strlen(extra)+1;
@@ -4872,8 +4896,9 @@
tChannelListInfo channel_list;
+ memset(&channel_list, 0, sizeof(channel_list));
status = iw_softap_get_channel_list(dev, info, wrqu, (char *)&channel_list);
- if ( !VOS_IS_STATUS_SUCCESS( status ) )
+ if ( !VOS_IS_STATUS_SUCCESS( status ) )
{
hddLog(VOS_TRACE_LEVEL_ERROR, "%s GetChannelList Failed!!!",__func__);
return -EINVAL;
@@ -5953,7 +5978,7 @@
return 0;
}
-static int iw_clear_dynamic_mcbc_filter(struct net_device *dev,
+static int iw_clear_dynamic_mcbc_filter(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
@@ -6123,7 +6148,7 @@
hddLog(VOS_TRACE_LEVEL_ERROR, "set Keep: TP before SME %d", keepaliveRequest.timePeriod);
- if (eHAL_STATUS_SUCCESS != sme_SetKeepAlive(WLAN_HDD_GET_HAL_CTX(pAdapter),
+ if (eHAL_STATUS_SUCCESS != sme_SetKeepAlive(WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, &keepaliveRequest))
{
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Keep Alive",
@@ -6135,7 +6160,7 @@
}
#ifdef WLAN_FEATURE_PACKET_FILTERING
-int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest,
+int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest,
tANI_U8 sessionId)
{
tSirRcvPktFilterCfgType packetFilterSetReq = {0};
@@ -6465,8 +6490,8 @@
pAdapter->mc_addr_list.mc_cnt;
for (i = 0; i < pAdapter->mc_addr_list.mc_cnt; i++)
{
- memcpy(&(pMulticastAddrs->multicastAddr[i][0]),
- &(pAdapter->mc_addr_list.addr[i][0]),
+ memcpy(pMulticastAddrs->multicastAddr[i],
+ pAdapter->mc_addr_list.addr[i],
sizeof(pAdapter->mc_addr_list.addr[i]));
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: %s multicast filter: addr ="
@@ -6648,9 +6673,9 @@
(char*) &(pStats->rx_error_cnt),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BYTE_CNT,
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BYTE_CNT,
(tANI_U8) sizeof (dStats->tx_uc_byte_cnt[0]),
- (char*) &(dStats->tx_uc_byte_cnt[0]),
+ (char*) &(dStats->tx_uc_byte_cnt[0]),
tlen);
FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_BYTE_CNT,
@@ -6669,29 +6694,29 @@
(char*) &(aStats->tx_rate),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_UC_BYTE_CNT,
- (tANI_U8) sizeof (dStats->rx_uc_byte_cnt[0]),
- (char*) &(dStats->rx_uc_byte_cnt[0]),
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_UC_BYTE_CNT,
+ (tANI_U8) sizeof (dStats->rx_uc_byte_cnt[0]),
+ (char*) &(dStats->rx_uc_byte_cnt[0]),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_MC_BYTE_CNT,
- (tANI_U8) sizeof (dStats->rx_mc_byte_cnt),
- (char*) &(dStats->rx_mc_byte_cnt),
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_MC_BYTE_CNT,
+ (tANI_U8) sizeof (dStats->rx_mc_byte_cnt),
+ (char*) &(dStats->rx_mc_byte_cnt),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_BC_BYTE_CNT,
- (tANI_U8) sizeof (dStats->rx_bc_byte_cnt),
- (char*) &(dStats->rx_bc_byte_cnt),
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_RX_BC_BYTE_CNT,
+ (tANI_U8) sizeof (dStats->rx_bc_byte_cnt),
+ (char*) &(dStats->rx_bc_byte_cnt),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_UC_BYTE_CNT,
- (tANI_U8) sizeof (dStats->tx_uc_byte_cnt[0]),
- (char*) &(dStats->tx_uc_byte_cnt[0]),
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_UC_BYTE_CNT,
+ (tANI_U8) sizeof (dStats->tx_uc_byte_cnt[0]),
+ (char*) &(dStats->tx_uc_byte_cnt[0]),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_MC_BYTE_CNT,
- (tANI_U8) sizeof (dStats->tx_mc_byte_cnt),
- (char*) &(dStats->tx_mc_byte_cnt),
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_MC_BYTE_CNT,
+ (tANI_U8) sizeof (dStats->tx_mc_byte_cnt),
+ (char*) &(dStats->tx_mc_byte_cnt),
tlen);
- FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BC_BYTE_CNT,
- (tANI_U8) sizeof (dStats->tx_bc_byte_cnt),
- (char*) &(dStats->tx_bc_byte_cnt),
+ FILL_TLV(p, (tANI_U8)WLAN_STATS_TX_BC_BYTE_CNT,
+ (tANI_U8) sizeof (dStats->tx_bc_byte_cnt),
+ (char*) &(dStats->tx_bc_byte_cnt),
tlen);
wrqu->data.length = tlen;
@@ -7368,12 +7393,12 @@
}
uTotalSize -= nOffset;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Power request parameter %d Total size",
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "Power request parameter %d Total size",
uTotalSize);
ptr += nOffset;
/* This is added for dynamic Tele LI enable (0xF1) /disable (0xF0)*/
- if(!(uTotalSize - nOffset) &&
+ if(!(uTotalSize - nOffset) &&
(powerRequest.uListenInterval != SIR_NOCHANGE_POWER_VALUE))
{
uTotalSize = 0;
@@ -7576,7 +7601,7 @@
{ WE_SET_TM_LEVEL,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
- 0,
+ 0,
"setTmLevel" },
{ WE_ENABLE_STRICT_FCC_REG,