Bluetooth: Mesh: Fixed reported coverity issues

Balaklaka · Balaklaka · commit dc3dcfd6f1d5 · 2025-03-01T09:39:34.000+01:00
Fixed High/Medium/Low covertiy reported issues:
- Out-of-bounds access
- Unchecked return values
- Logically dead code
- Defererence null return value
- Unnecessary header file
- Recursion in included headers
- Uninitialized scalar variable

Signed-off-by: Ingar Kulbrandstad &lt;ingar.kulbrandstad@nordicsemi.no&gt;
diff --git a/samples/bluetooth/mesh/dfu/distributor/src/main.c b/samples/bluetooth/mesh/dfu/distributor/src/main.c
@@ -11,7 +11,6 @@
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/mesh.h>
-#include <zephyr/bluetooth/mesh/shell.h>
 #include <bluetooth/mesh/vnd/le_pair_resp.h>
 #include <bluetooth/mesh/dk_prov.h>
 #include <dk_buttons_and_leds.h>
diff --git a/samples/bluetooth/mesh/light_ctrl/src/lc_pwm_led.c b/samples/bluetooth/mesh/light_ctrl/src/lc_pwm_led.c
@@ -31,5 +31,5 @@ void lc_pwm_led_set(uint16_t desired_lvl)
 		(PWM_PERIOD * desired_lvl) /
 		BT_MESH_LIGHTNESS_MAX;
 
-	pwm_set_dt(&led0, PWM_USEC(PWM_PERIOD), PWM_USEC(scaled_lvl));
+	(void)pwm_set_dt(&led0, PWM_USEC(PWM_PERIOD), PWM_USEC(scaled_lvl));
 }
diff --git a/samples/bluetooth/mesh/light_ctrl/src/model_handler.c b/samples/bluetooth/mesh/light_ctrl/src/model_handler.c
@@ -200,11 +200,11 @@ static int energy_use_get(struct bt_mesh_sensor_srv *srv,
 			 struct bt_mesh_sensor_value *rsp)
 {
 	/* Report energy usage as dummy value, and increase it by one every time
-	 * a get callback is triggered. The logic and hardware for mesuring
+	 * a get callback is triggered. The logic and hardware for measuring
 	 * the actual energy usage of the device should be implemented here.
 	 */
-	bt_mesh_sensor_value_from_micro(sensor->type->channels[0].format,
-					dummy_energy_use * 1000000LL, rsp);
+	(void)bt_mesh_sensor_value_from_micro(sensor->type->channels[0].format,
+					      dummy_energy_use * 1000000LL, rsp);
 	dummy_energy_use++;
 
 	return 0;
diff --git a/samples/bluetooth/mesh/sensor_server/src/model_handler.c b/samples/bluetooth/mesh/sensor_server/src/model_handler.c
@@ -1103,7 +1103,9 @@ const struct bt_mesh_comp *model_handler_init(void)
 	dk_button_handler_add(&button_handler);
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		settings_subsys_init();
+		if (!settings_subsys_init()) {
+			printf("Failed to initialize setting subsystem");
+		}
 		settings_register(&temp_range_conf);
 		settings_register(&presence_motion_threshold_conf);
 		settings_register(&amb_light_level_gain_conf);
diff --git a/samples/bluetooth/mesh/silvair_enocean/src/model_handler.c b/samples/bluetooth/mesh/silvair_enocean/src/model_handler.c
@@ -14,7 +14,6 @@
  */
 #include <zephyr/bluetooth/bluetooth.h>
 #include <bluetooth/mesh/models.h>
-#include <bluetooth/enocean.h>
 #include <bluetooth/mesh/vnd/silvair_enocean_srv.h>
 #include <dk_buttons_and_leds.h>
 #include "model_handler.h"
diff --git a/subsys/bluetooth/enocean.c b/subsys/bluetooth/enocean.c
@@ -458,7 +458,7 @@ static void adv_recv(const struct bt_le_scan_recv_info *info,
 
 static void store_dirty(struct k_work *work)
 {
-	int err;
+	int err = 0;
 
 	for (int i = 0; i < ARRAY_SIZE(devices); ++i) {
 		if (!(devices[i].flags & FLAG_DIRTY)) {
@@ -617,12 +617,12 @@ void bt_enocean_decommission(struct bt_enocean_device *dev)
 
 	if (IS_ENABLED(CONFIG_BT_ENOCEAN_STORE)) {
 		encode_tag(name, dev - &devices[0], ENTRY_TAG_DEVICE);
-		settings_delete(name);
+		(void)settings_delete(name);
 	}
 
 	if (IS_ENABLED(CONFIG_BT_ENOCEAN_STORE_SEQ)) {
 		encode_tag(name, dev - &devices[0], ENTRY_TAG_SEQ);
-		settings_delete(name);
+		(void)settings_delete(name);
 	}
 
 	dev->flags = 0;
diff --git a/subsys/bluetooth/mesh/gen_prop_srv.c b/subsys/bluetooth/mesh/gen_prop_srv.c
@@ -9,7 +9,6 @@
 #include "gen_prop_internal.h"
 #include "model_utils.h"
 #include "mesh/net.h"
-#include "mesh/transport.h"
 
 #define LOG_LEVEL CONFIG_BT_MESH_MODEL_LOG_LEVEL
 #include "zephyr/logging/log.h"
diff --git a/subsys/bluetooth/mesh/model_utils.c b/subsys/bluetooth/mesh/model_utils.c
@@ -5,7 +5,6 @@
  */
 #include <bluetooth/mesh/models.h>
 #include "model_utils.h"
-#include "mesh/mesh.h"
 
 #define LOG_LEVEL CONFIG_BT_MESH_MODEL_LOG_LEVEL
 #include "zephyr/logging/log.h"
diff --git a/subsys/bluetooth/mesh/scheduler_srv.c b/subsys/bluetooth/mesh/scheduler_srv.c
@@ -6,7 +6,6 @@
 
 #include <stdio.h>
 #include <bluetooth/mesh/models.h>
-#include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/random/random.h>
diff --git a/subsys/bluetooth/mesh/sensor_cli.c b/subsys/bluetooth/mesh/sensor_cli.c
@@ -6,11 +6,9 @@
 
 #include <stdlib.h>
 #include <bluetooth/mesh/sensor_cli.h>
-#include <bluetooth/mesh/properties.h>
 #include "model_utils.h"
 #include "sensor.h"
 #include "mesh/net.h"
-#include "mesh/transport.h"
 
 #define LOG_LEVEL CONFIG_BT_MESH_MODEL_LOG_LEVEL
 #include "zephyr/logging/log.h"
diff --git a/subsys/bluetooth/mesh/sensor_srv.c b/subsys/bluetooth/mesh/sensor_srv.c
@@ -10,7 +10,6 @@
 #include <bluetooth/mesh/properties.h>
 #include "mesh/net.h"
 #include "mesh/access.h"
-#include "mesh/transport.h"
 #include "model_utils.h"
 #include "sensor.h"
 
diff --git a/subsys/bluetooth/mesh/shell/shell_bat_cli.c b/subsys/bluetooth/mesh/shell/shell_bat_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_ctl_cli.c b/subsys/bluetooth/mesh/shell/shell_ctl_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_ctrl_cli.c b/subsys/bluetooth/mesh/shell/shell_ctrl_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_dm_cli.c b/subsys/bluetooth/mesh/shell/shell_dm_cli.c
@@ -9,8 +9,6 @@
 #include <zephyr/shell/shell.h>
 #include <bluetooth/mesh/vnd/dm_cli.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_dtt_cli.c b/subsys/bluetooth/mesh/shell/shell_dtt_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_hsl_cli.c b/subsys/bluetooth/mesh/shell/shell_hsl_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_lightness_cli.c b/subsys/bluetooth/mesh/shell/shell_lightness_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_loc_cli.c b/subsys/bluetooth/mesh/shell/shell_loc_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_lvl_cli.c b/subsys/bluetooth/mesh/shell/shell_lvl_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_onoff_cli.c b/subsys/bluetooth/mesh/shell/shell_onoff_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_plvl_cli.c b/subsys/bluetooth/mesh/shell/shell_plvl_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_ponoff_cli.c b/subsys/bluetooth/mesh/shell/shell_ponoff_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_prop_cli.c b/subsys/bluetooth/mesh/shell/shell_prop_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 #define LOG_LEVEL CONFIG_BT_MESH_MODEL_LOG_LEVEL
diff --git a/subsys/bluetooth/mesh/shell/shell_scene_cli.c b/subsys/bluetooth/mesh/shell/shell_scene_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 #define SHELL_SENSOR_CLI_REG_CNT_MAX 32
diff --git a/subsys/bluetooth/mesh/shell/shell_scheduler_cli.c b/subsys/bluetooth/mesh/shell/shell_scheduler_cli.c
@@ -7,10 +7,7 @@
 #include <stdlib.h>
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
-#include <zephyr/sys/math_extras.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "../model_utils.h"
 
 #include "shell_utils.h"
diff --git a/subsys/bluetooth/mesh/shell/shell_sensor_cli.c b/subsys/bluetooth/mesh/shell/shell_sensor_cli.c
@@ -6,7 +6,6 @@
 
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
-#include <ctype.h>
 
 #include "shell_utils.h"
 
diff --git a/subsys/bluetooth/mesh/shell/shell_time_cli.c b/subsys/bluetooth/mesh/shell/shell_time_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/shell/shell_utils.c b/subsys/bluetooth/mesh/shell/shell_utils.c
@@ -6,11 +6,9 @@
 
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
-#include <ctype.h>
 #include <string.h>
 #include <errno.h>
 
-#include "mesh/net.h"
 #include "mesh/access.h"
 #include "shell_utils.h"
 
diff --git a/subsys/bluetooth/mesh/shell/shell_xyl_cli.c b/subsys/bluetooth/mesh/shell/shell_xyl_cli.c
@@ -8,8 +8,6 @@
 #include <bluetooth/mesh/models.h>
 #include <zephyr/shell/shell.h>
 
-#include "mesh/net.h"
-#include "mesh/access.h"
 #include "shell_utils.h"
 
 static const struct bt_mesh_model *mod;
diff --git a/subsys/bluetooth/mesh/vnd/le_pair_resp.c b/subsys/bluetooth/mesh/vnd/le_pair_resp.c
@@ -10,7 +10,6 @@
 #include <bluetooth/mesh/vnd/le_pair_resp.h>
 #include "../model_utils.h"
 #include "mesh/net.h"
-#include "mesh/access.h"
 
 #define LOG_LEVEL CONFIG_BT_MESH_MODEL_LOG_LEVEL
 #include "zephyr/logging/log.h"
diff --git a/tests/bluetooth/tester/src/mmdl.c b/tests/bluetooth/tester/src/mmdl.c
diff --git a/tests/bluetooth/tester/src/model_handler.c b/tests/bluetooth/tester/src/model_handler.c
diff --git a/tests/subsys/bluetooth/mesh/metadata_extraction/src/main.c b/tests/subsys/bluetooth/mesh/metadata_extraction/src/main.c
diff --git a/tests/subsys/bluetooth/mesh/models/src/main.c b/tests/subsys/bluetooth/mesh/models/src/main.c

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ void lc_pwm_led_set(uint16_t desired_lvl)`
`31`	`31`	`(PWM_PERIOD * desired_lvl) /`
`32`	`32`	`BT_MESH_LIGHTNESS_MAX;`
`33`	`33`
`34`		`- pwm_set_dt(&led0, PWM_USEC(PWM_PERIOD), PWM_USEC(scaled_lvl));`
	`34`	`+ (void)pwm_set_dt(&led0, PWM_USEC(PWM_PERIOD), PWM_USEC(scaled_lvl));`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ static void adv_recv(const struct bt_le_scan_recv_info *info,`
`458`	`458`
`459`	`459`	`static void store_dirty(struct k_work *work)`
`460`	`460`	`{`
`461`		`- int err;`
	`461`	`+ int err = 0;`
`462`	`462`
`463`	`463`	`for (int i = 0; i < ARRAY_SIZE(devices); ++i) {`
`464`	`464`	`if (!(devices[i].flags & FLAG_DIRTY)) {`
`@@ -617,12 +617,12 @@ void bt_enocean_decommission(struct bt_enocean_device *dev)`
`617`	`617`
`618`	`618`	`if (IS_ENABLED(CONFIG_BT_ENOCEAN_STORE)) {`
`619`	`619`	`encode_tag(name, dev - &devices[0], ENTRY_TAG_DEVICE);`
`620`		`- settings_delete(name);`
	`620`	`+ (void)settings_delete(name);`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`if (IS_ENABLED(CONFIG_BT_ENOCEAN_STORE_SEQ)) {`
`624`	`624`	`encode_tag(name, dev - &devices[0], ENTRY_TAG_SEQ);`
`625`		`- settings_delete(name);`
	`625`	`+ (void)settings_delete(name);`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`dev->flags = 0;`