commit 4d3daf5cf001f74b0af89043e787906d2b6b567d
author Sandeep Puligilla <spuligil@codeaurora.org> Wed Feb 28 18:39:07 2018 -0800
committer nshrivas <nshrivas@codeaurora.org> Fri Mar 02 23:45:16 2018 -0800
tree 5383fbe7f4d3cb927a7d43a0a5bffaf35877168c
parent 31b98d4cd73b29da80b3373de81161f2c9ed866d

qcacmn: Fix static analysis

Fix static analysis issues on spectral modules.

CRs-Fixed: 2196066
Change-Id: I7588a26108ff3c0b01f480007ffe3d3b91c29b8e

spectral/dispatcher/src/wlan_spectral_utils_api.c

diff --git a/spectral/dispatcher/src/wlan_spectral_utils_api.c b/spectral/dispatcher/src/wlan_spectral_utils_api.c
index 56d8970..4acb6c6 100644
--- a/spectral/dispatcher/src/wlan_spectral_utils_api.c
+++ b/spectral/dispatcher/src/wlan_spectral_utils_api.c
@@ -120,6 +120,11 @@
 	struct spectral_context *sc;
 
 	sc = spectral_get_spectral_ctx_from_vdev(vdev);
+	if (!sc) {
+		spectral_err("spectral context is Null");
+		return -EINVAL;
+	}
+
 	return sc->legacy_cbacks.vdev_get_chan_freq(vdev);
 }
 
@@ -129,6 +134,11 @@
 	struct spectral_context *sc;
 
 	sc = spectral_get_spectral_ctx_from_vdev(vdev);
+	if (!sc) {
+		spectral_err("spectral context is Null");
+		return CH_WIDTH_INVALID;
+	}
+
 	return sc->legacy_cbacks.vdev_get_ch_width(vdev);
 }
 
@@ -139,6 +149,11 @@
 	struct spectral_context *sc;
 
 	sc = spectral_get_spectral_ctx_from_vdev(vdev);
+	if (!sc) {
+		spectral_err("spectral context is Null");
+		return -EINVAL;
+	}
+
 	return sc->legacy_cbacks.vdev_get_sec20chan_freq_mhz(vdev,
 							     sec20chan_freq);
 }
@@ -166,8 +181,10 @@
 		spectral_err("PDEV is NULL!");
 
 	sc = spectral_get_spectral_ctx_from_pdev(pdev);
-	if (!sc)
+	if (!sc) {
 		spectral_err("spectral context is NULL!");
+		return;
+	}
 
 	return sc->sptrlc_register_wmi_spectral_cmd_ops(pdev, cmd_ops);
 }

target_if/spectral/target_if_spectral.c

diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c
index c99288f..97fc385 100644
--- a/target_if/spectral/target_if_spectral.c
+++ b/target_if/spectral/target_if_spectral.c
@@ -561,6 +561,7 @@
 	 */
 	init_def_retval = target_if_spectral_info_init_defaults(spectral);
 	if (init_def_retval != QDF_STATUS_SUCCESS) {
+		qdf_spin_unlock(&info->osps_lock);
 		if (init_def_retval == QDF_STATUS_E_NOENT)
 			return -ENOENT;
 		else

target_if/spectral/target_if_spectral.h

diff --git a/target_if/spectral/target_if_spectral.h b/target_if/spectral/target_if_spectral.h
index b9979f9..f22fae5 100644
--- a/target_if/spectral/target_if_spectral.h
+++ b/target_if/spectral/target_if_spectral.h
@@ -1131,6 +1131,10 @@
 	struct wlan_objmgr_psoc *psoc = NULL;
 
 	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		spectral_err("psoc is NULL");
+		return -EINVAL;
+	}
 
 	return psoc->soc_cb.rx_ops.sptrl_rx_ops.sptrlro_vdev_get_chan_freq(
 		vdev);
@@ -1151,6 +1155,10 @@
 	struct wlan_objmgr_psoc *psoc = NULL;
 
 	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		spectral_err("psoc is NULL");
+		return CH_WIDTH_INVALID;
+	}
 
 	return psoc->soc_cb.rx_ops.sptrl_rx_ops.sptrlro_vdev_get_ch_width(
 		vdev);
@@ -1173,6 +1181,10 @@
 	struct wlan_objmgr_psoc *psoc = NULL;
 
 	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		spectral_err("psoc is NULL");
+		return -EINVAL;
+	}
 
 	return psoc->soc_cb.rx_ops.sptrl_rx_ops.
 		sptrlro_vdev_get_sec20chan_freq_mhz(vdev, sec20chan_freq);