Quellcode durchsuchen

qcacld-3.0: Fix suspicious dereference of pointer

qcacld-2.0 to qcacld-3.0 propagation

Fix to add NULL check before dereferencing of pointer

Change-Id: I6cfbb5cb6a434a924e988bab50a5a062a2499ccf
CRs-Fixed: 1039152
Sreelakshmi Konamki vor 8 Jahren
Ursprung
Commit
9d866dfe20
2 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
  1. 1 1
      core/mac/src/pe/nan/nan_datapath.c
  2. 6 4
      core/wma/src/wma_power.c

+ 1 - 1
core/mac/src/pe/nan/nan_datapath.c

@@ -722,11 +722,11 @@ void lim_process_ndi_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msgq,
 	tLimMlmStartCnf mlm_start_cnf;
 	tpAddBssParams add_bss_params = (tpAddBssParams) lim_msgq->bodyptr;
 
-	lim_log(mac_ctx, LOG1, FL("Status %d"), add_bss_params->status);
 	if (NULL == add_bss_params) {
 		lim_log(mac_ctx, LOGE, FL("Invalid body pointer in message"));
 		goto end;
 	}
+	lim_log(mac_ctx, LOG1, FL("Status %d"), add_bss_params->status);
 	if (QDF_STATUS_SUCCESS == add_bss_params->status) {
 		lim_log(mac_ctx, LOG1,
 		       FL("WDA_ADD_BSS_RSP returned QDF_STATUS_SUCCESS"));

+ 6 - 4
core/wma/src/wma_power.c

@@ -1949,11 +1949,13 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id)
 		uint32_t cfg_data_val = 0;
 		/* get mac to acess CFG data base */
 		struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+		if (!mac) {
+			WMA_LOGE(FL("Failed to get mac context"));
+			return;
+		}
 		/* Set Listen Interval */
-		if ((NULL == mac) || (wlan_cfg_get_int(mac,
-						       WNI_CFG_LISTEN_INTERVAL,
-						       &cfg_data_val) !=
-				      eSIR_SUCCESS)) {
+		if ((wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
+				      &cfg_data_val) != eSIR_SUCCESS)) {
 			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for listen interval");
 			cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;