DAOS-15744 ddb: Fixes for Coverity Issues (#14275)

2555532 2555534 2555543 2555544 2555546 2555540 2555528 2555522 2555521 2555518 Also added 'ddb' to VALID_COMPONENTS for jira query. After moving ddb into utils dir 'ddb' isn't automatically a valid component. Signed-off-by: Ryon Jensen <[email protected]>
daos-stack · May 14, 2024 · 1c80f20 · 1c80f20
1 parent 29b3b77
commit 1c80f20
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 36 deletions.
diff --git a/ci/jira_query.py b/ci/jira_query.py
@@ -29,7 +29,7 @@
 # valid.  We've never checked/enforced these before so there have been a lot of values used in the
 # past.
 VALID_COMPONENTS = ('agent', 'build', 'ci', 'csum', 'doc', 'gha', 'il', 'md', 'mercury',
-                    'packaging', 'pil4dfs', 'swim', 'test', 'tools')
+                    'packaging', 'pil4dfs', 'swim', 'test', 'tools', 'ddb')
 
 # Expected ticket prefix.
 VALID_TICKET_PREFIX = ('DAOS', 'CORCI', 'SRE')

diff --git a/src/utils/ddb/ddb.c b/src/utils/ddb/ddb.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2022-2023 Intel Corporation.
+ * (C) Copyright 2022-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -772,12 +772,14 @@ ddb_run_cmd(struct ddb_ctx *ctx, const char *cmd_str, bool write_mode)
 		cmd_copy[strlen(cmd_copy) - 1] = '\0';
 
 	rc = ddb_str2argv_create(cmd_copy, &parse_args);
-	if (!SUCCESS(rc))
-		D_GOTO(done, rc);
+	if (!SUCCESS(rc)) {
+		D_FREE(cmd_copy);
+		return rc;
+	}
 
 	if (parse_args.ap_argc == 0) {
 		D_ERROR("Nothing parsed\n");
-		return -DER_INVAL;
+		D_GOTO(done, rc = -DER_INVAL);
 	}
 
 	rc = ddb_parse_cmd_args(ctx, parse_args.ap_argc, parse_args.ap_argv, &info);

diff --git a/src/utils/ddb/ddb_parse.c b/src/utils/ddb/ddb_parse.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2019-2022 Intel Corporation.
+ * (C) Copyright 2019-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -10,6 +10,14 @@
 #include "ddb_common.h"
 #include "ddb_parse.h"
 
+void
+safe_strcat(char *dst, const char *src, size_t dst_size)
+{
+	size_t remaining_space = dst_size - strlen(dst) - 1; // Subtract 1 for null terminator
+
+	strncat(dst, src, remaining_space);
+}
+
 int
 vos_path_parse(const char *path, struct vos_file_parts *vos_file_parts)
 {
@@ -29,8 +37,8 @@ vos_path_parse(const char *path, struct vos_file_parts *vos_file_parts)
 	while (tok != NULL && rc != 0) {
 		rc = uuid_parse(tok, vos_file_parts->vf_pool_uuid);
 		if (!SUCCESS(rc)) {
-			strcat(vos_file_parts->vf_db_path, "/");
-			strcat(vos_file_parts->vf_db_path, tok);
+			safe_strcat(vos_file_parts->vf_db_path, "/", DB_PATH_LEN);
+			safe_strcat(vos_file_parts->vf_db_path, tok, DB_PATH_LEN);
 		}
 		tok = strtok(NULL, "/");
 	}
@@ -83,14 +91,16 @@ ddb_str2argv_create(const char *buf, struct argv_parsed *parse_args)
 	parse_args->ap_argv = we->we_wordv;
 	parse_args->ap_ctx = we;
 
-	return rc;
+	return 0;
 }
 
 void
 ddb_str2argv_free(struct argv_parsed *parse_args)
 {
-	wordfree(parse_args->ap_ctx);
-	D_FREE(parse_args->ap_ctx);
+	if (parse_args->ap_ctx != NULL) {
+		wordfree(parse_args->ap_ctx);
+		D_FREE(parse_args->ap_ctx);
+	}
 }
 
 int

diff --git a/src/utils/ddb/ddb_parse.h b/src/utils/ddb/ddb_parse.h
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2019-2022 Intel Corporation.
+ * (C) Copyright 2019-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -21,9 +21,9 @@ struct program_args {
 	bool  pa_write_mode;
 	bool  pa_get_help;
 };
-
+#define DB_PATH_LEN 64
 struct vos_file_parts {
-	char		vf_db_path[64];
+	char            vf_db_path[DB_PATH_LEN];
 	uuid_t		vf_pool_uuid;
 	char		vf_vos_file[16];
 	uint32_t	vf_target_idx;

diff --git a/src/utils/ddb/ddb_tree_path.c b/src/utils/ddb/ddb_tree_path.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2023 Intel Corporation.
+ * (C) Copyright 2023-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -187,6 +187,8 @@ parse_key(const char *key_str, struct dv_indexed_tree_path *itp, enum path_parts
 	if (strlen(key_str) == 0)
 		return 0;
 
+	D_ASSERT(key_part < PATH_PART_END);
+
 	/* is an index */
 	if (key_str[0] == '[') {
 		uint32_t idx;
@@ -512,19 +514,22 @@ itp_unset_cont(struct dv_indexed_tree_path *itp)
 int
 itp_idx(struct dv_indexed_tree_path *itp, enum path_parts part_key)
 {
+	D_ASSERT(part_key < PATH_PART_END);
 	return itp->itp_parts[part_key].itp_part_idx;
 }
 
 bool
 itp_has_complete(struct dv_indexed_tree_path *itp, enum path_parts part_key)
 {
+	D_ASSERT(part_key < PATH_PART_END);
 	return itp->itp_parts[part_key].itp_has_part_value &&
 	       itp->itp_parts[part_key].itp_has_part_idx;
 }
 
 bool
 itp_has(struct dv_indexed_tree_path *itp, enum path_parts part_key)
 {
+	D_ASSERT(part_key < PATH_PART_END);
 	return itp->itp_parts[part_key].itp_has_part_value ||
 	       itp->itp_parts[part_key].itp_has_part_idx;
 }
@@ -539,12 +544,14 @@ itp_has_value(struct dv_indexed_tree_path *itp)
 bool
 itp_has_idx(struct dv_indexed_tree_path *itp, enum path_parts part_key)
 {
+	D_ASSERT(part_key < PATH_PART_END);
 	return itp->itp_parts[part_key].itp_has_part_idx;
 }
 
 bool
 itp_has_part_value(struct dv_indexed_tree_path *itp, enum path_parts part_key)
 {
+	D_ASSERT(part_key < PATH_PART_END);
 	return itp->itp_parts[part_key].itp_has_part_value;
 }
 
@@ -633,6 +640,7 @@ itp_verify(struct dv_indexed_tree_path *itp)
 static union itp_part_type *
 itp_value(struct dv_indexed_tree_path *itp, enum path_parts path_key)
 {
+	D_ASSERT(path_key < PATH_PART_END);
 	return &itp->itp_parts[path_key].itp_part_value;
 }
 

diff --git a/src/utils/ddb/ddb_vos.c b/src/utils/ddb/ddb_vos.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2022-2023 Intel Corporation.
+ * (C) Copyright 2022-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -379,7 +379,7 @@ vos_iterator_type_to_path_part(vos_iter_type_t type)
 static enum path_parts
 vos_enum_to_path_part(vos_iter_type_t t)
 {
-	enum path_parts map[VOS_ITER_LARGEST];
+	enum path_parts map[VOS_ITER_LARGEST] = {0};
 
 	map[VOS_ITER_OBJ] = PATH_PART_OBJ;
 	map[VOS_ITER_DKEY] = PATH_PART_DKEY;
@@ -393,7 +393,7 @@ vos_enum_to_path_part(vos_iter_type_t t)
 static enum path_parts
 vos_enum_to_parent_path_part(vos_iter_type_t t)
 {
-	int map[VOS_ITER_LARGEST];
+	int map[VOS_ITER_LARGEST] = {0};
 
 	map[VOS_ITER_OBJ] = PATH_PART_CONT;
 	map[VOS_ITER_DKEY] = PATH_PART_OBJ;
@@ -1741,11 +1741,9 @@ sync_cb(struct ddbs_sync_info *info, void *cb_args)
 
 	/* Try to delete the target first */
 	rc = smd_pool_del_tgt(pool_id, info->dsi_hdr->bbh_vos_id, st);
-	if (!SUCCESS(rc)) {
+	if (!SUCCESS(rc))
 		/* Ignore error for now ... might not exist*/
-		D_WARN("delete target failed: "DF_RC"\n", DP_RC(rc));
-		rc = 0;
-	}
+		D_WARN("delete target failed: " DF_RC "\n", DP_RC(rc));
 
 	rc = smd_pool_add_tgt(pool_id, info->dsi_hdr->bbh_vos_id,
 			      info->dsi_hdr->bbh_blob_id, st, blob_size);

diff --git a/src/utils/ddb/tests/ddb_commands_tests.c b/src/utils/ddb/tests/ddb_commands_tests.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2022-2023 Intel Corporation.
+ * (C) Copyright 2022-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -389,8 +389,11 @@ dcv_suit_teardown(void **state)
 {
 	struct dt_vos_pool_ctx *tctx = *state;
 
-	if (tctx == NULL)
+	if (tctx == NULL) {
 		fail_msg("Test not setup correctly");
+		return -DER_UNKNOWN;
+	}
+
 	assert_success(dv_pool_close(tctx->dvt_poh));
 	ddb_teardown_vos(state);
 

diff --git a/src/utils/ddb/tests/ddb_main_tests.c b/src/utils/ddb/tests/ddb_main_tests.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2022 Intel Corporation.
+ * (C) Copyright 2022-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -251,8 +251,11 @@ ddb_main_suit_teardown(void **state)
 {
 	struct dt_vos_pool_ctx *tctx = *state;
 
-	if (tctx == NULL)
+	if (tctx == NULL) {
 		fail_msg("Test not setup correctly");
+		return -DER_UNKNOWN;
+	}
+
 	assert_success(dv_pool_close(tctx->dvt_poh));
 	ddb_teardown_vos(state);
 

diff --git a/src/utils/ddb/tests/ddb_parse_tests.c b/src/utils/ddb/tests/ddb_parse_tests.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2022-2023 Intel Corporation.
+ * (C) Copyright 2022-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -40,7 +40,6 @@ assert_parsed_fail(const char *str)
 	int			rc;
 
 	rc = ddb_str2argv_create(str, &parse_args);
-	ddb_str2argv_free(&parse_args);
 	assert_rc_equal(-DER_INVAL, rc);
 }
 

diff --git a/src/utils/ddb/tests/ddb_test_driver.c b/src/utils/ddb/tests/ddb_test_driver.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2022 Intel Corporation.
+ * (C) Copyright 2022-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -208,20 +208,20 @@ int
 ddb_test_pool_setup(struct dt_vos_pool_ctx *tctx)
 {
 	int			 rc;
-	uint64_t		 size = (1ULL << 30);
-	struct stat		 st = {0};
+	uint64_t                 size      = (1ULL << 30);
 	char			*pool_uuid = "12345678-1234-1234-1234-123456789012";
+	int                      mkdir_result;
 
 	if (strlen(tctx->dvt_pmem_file) == 0) {
 		char dir[64] = {0};
 
 		sprintf(dir, "/mnt/daos/%s", pool_uuid);
-		if (stat(dir, &st) == -1) {
-			if (!SUCCESS(mkdir(dir, 0700))) {
-				rc = daos_errno2der(errno);
-				return rc;
-			}
+		mkdir_result = mkdir(dir, 0700);
+		if (mkdir_result == -1 && errno != EEXIST) {
+			rc = daos_errno2der(errno);
+			return rc;
 		}
+
 		snprintf(tctx->dvt_pmem_file, ARRAY_SIZE(tctx->dvt_pmem_file),
 			 "%s/ddb_vos_test", dir);
 	}
@@ -314,6 +314,11 @@ ddb_teardown_vos(void **state)
 {
 	struct dt_vos_pool_ctx		*tctx = *state;
 
+	if (tctx == NULL) {
+		fail_msg("Test context not setup correctly");
+		return -DER_UNKNOWN;
+	}
+
 	vos_self_init("/mnt/daos", false, 0);
 	assert_success(vos_pool_destroy(tctx->dvt_pmem_file, tctx->dvt_pool_uuid));
 	vos_self_fini();