commit fd9733e2d91b0f08b460e892c85f88534a2f5ef6
author Alexander Wachter <alexander@wachter.cloud> Tue Feb 04 09:34:58 2020 +0100
committer Jukka Rissanen <jukka.rissanen@linux.intel.com> Thu Feb 06 09:58:46 2020 +0200
tree defe3716bb8e69cc12ed1d1807d122b3a565942d
parent 6a668790508ee56beaea312a3b06597761565e95

canopen: CO_driver: Fix Coverity issues (NULL deref, dead code)

There were two dereference after NULL check and logical dead code.

Fixes #22434
Fixes #22443
Fixes #22435
Coverity-CID: 207978
Coverity-CID: 207977
Coverity-CID: 207964

Signed-off-by: Alexander Wachter <alexander@wachter.cloud>

subsys/canbus/canopen/CO_driver.c

diff --git a/subsys/canbus/canopen/CO_driver.c b/subsys/canbus/canopen/CO_driver.c
index ecc36a4..7a101cb 100644
--- a/subsys/canbus/canopen/CO_driver.c
+++ b/subsys/canbus/canopen/CO_driver.c
@@ -253,7 +253,11 @@
 	struct zcan_filter filter;
 	CO_CANrx_t *buffer;
 
-	if (!CANmodule || !pFunct || (index >= CANmodule->rx_size)) {
+	if (CANmodule == NULL) {
+		return CO_ERROR_ILLEGAL_ARGUMENT;
+	}
+
+	if (!pFunct || (index >= CANmodule->rx_size)) {
 		LOG_ERR("failed to initialize CAN rx buffer, illegal argument");
 		CO_errorReport(CANmodule->em, CO_EM_GENERIC_SOFTWARE_ERROR,
 			       CO_EMC_SOFTWARE_INTERNAL, 0);
@@ -293,7 +297,11 @@
 {
 	CO_CANtx_t *buffer;
 
-	if (!CANmodule || (index >= CANmodule->tx_size)) {
+	if (CANmodule == NULL) {
+		return NULL;
+	}
+
+	if (index >= CANmodule->tx_size) {
 		LOG_ERR("failed to initialize CAN rx buffer, illegal argument");
 		CO_errorReport(CANmodule->em, CO_EM_GENERIC_SOFTWARE_ERROR,
 			       CO_EMC_SOFTWARE_INTERNAL, 0);
@@ -447,7 +455,8 @@
 			}
 		}
 
-		if (rx_overflows != 0U) {
+		/* This code can be activated if we can read the overflows*/
+		if (false && rx_overflows != 0U) {
 			CO_errorReport(em, CO_EM_CAN_RXB_OVERFLOW,
 				       CO_EMC_CAN_OVERRUN, errors);
 		}