accel-config: Fix some clang scan-build warnings and bugs
Ramesh Thomas
PATCH 1/1 accel-config: Fix some clang scan-build warnings and bugs
clang scan-build tool found some issues in static scan. Though they are not impacting currently, they have the potential of causing bugs if not careful. Cleaned up code in the reported areas.
Info about the clang scan-build tool is at
https://clang.llvm.org/get_started.html#build
Reported-by Colin Ian King <colin.king(a)intel.com>
Signed-off-by Ramesh Thomas <ramesh.thomas(a)intel.com>
--- accfg/accel-config.c | 2 +- accfg/enable.c | 40 ++++++++++++++++------------------------ accfg/lib/libaccfg.c | 7 +++++++ accfg/mdev.c | 4 ++-- test/dsa.c | 7 ++++++- test/dsa_prep.c | 1 - util/abspath.c | 9 ++------- util/strbuf.c | 3 ++- 8 files changed, 36 insertions(+), 37 deletions(-)
accfg/accel-config.c +1 -1
@@ -40,7 +40,7 @@ static int cmd_help(int argc, const char **argv, void *ctx) NULL }; - argc =parse_options_subcommand (argc, argv, builtin_help_options, +parse_options_subcommand (argc, argv, builtin_help_options, builtin_help_subcommands, builtin_help_usage,0 );
accfg/enable.c +16 -24
@@ -90,22 +90,18 @@ static int device_action(int argc, const char **argv, const char *usage, NULL };int i, rc = -EINVAL , success =0 ; -const char *all ="all" ;enum accfg_device_state state; argc =parse_options (argc, argv, options, u,0 ); -if (argc ==0 ) { - argc =1 ; - argv = &all; -usage_with_options (u, options); - }else { -for (i =0 ; i < argc; i++) { -if (strcmp (argv[i],"all" ) ==0 ) { - argv[0 ] ="all" ; - argc =1 ; -break ; - } +if (argc ==0 ) +usage_with_options (u, options);/* exits app */ + +for (i =0 ; i < argc; i++) { +if (strcmp (argv[i],"all" ) ==0 ) { + argv[0 ] ="all" ; + argc =1 ; +break ; } }
@@ -206,21 +202,17 @@ static int wq_action(int argc, const char **argv, const char *usage, NULL };int i, rc = -EINVAL , success =0 ; -const char *all ="all" ; argc =parse_options (argc, argv, options, u,0 ); -if (argc ==0 ) { - argc =1 ; - argv = &all; -usage_with_options (u, options); - }else { -for (i =0 ; i < argc; i++) { -if (strcmp (argv[i],"all" ) ==0 ) { - argv[0 ] ="all" ; - argc =1 ; -break ; - } +if (argc ==0 ) +usage_with_options (u, options);/* exits app */ + +for (i =0 ; i < argc; i++) { +if (strcmp (argv[i],"all" ) ==0 ) { + argv[0 ] ="all" ; + argc =1 ; +break ; } }
accfg/lib/libaccfg.c +7 -0
@@ -806,9 +806,11 @@ static void *add_wq(void *parent, int id, const char *wq_base,if (sscanf (basename (wq_base_string),"wq%" SCNu64".%" SCNu64, &device_id, &wq_id) !=2 ) { +free (wq_base_string);close (dfd); goto err_wq; } +free (wq_base_string); wq->id = wq_id; wq->group = group;
@@ -902,9 +904,12 @@ static void *add_group(void *parent, int id, const char *group_base, }if (sscanf (basename (group_base_string),"group%" SCNu64".%" SCNu64, &device_id, &group_id) !=2 ) { +free (group_base_string);close (dfd); goto err_group; } +free (group_base_string); + group->group_path = (char *)group_base; group->device = device; device->group = group;
@@ -994,11 +999,13 @@ static void *add_engine(void *parent, int id, const char *engine_base, }if (sscanf (basename (engine_base_string),"engine%" SCNu64".%" SCNu64, &device_id, &engine_id) !=2 ) { +free (engine_base_string);close (dfd);free (path);free (engine);return NULL ; } +free (engine_base_string); engine->id = engine_id; engine->group = group;
accfg/mdev.c +2 -2
@@ -95,7 +95,7 @@ int cmd_create_mdev(int argc, const char **argv, void *ctx)return 0 ; } - argc =parse_options (argc, argv, options, u,0 ); +parse_options (argc, argv, options, u,0 );if (opt_called)return 0 ;
@@ -148,7 +148,7 @@ int cmd_remove_mdev(int argc, const char **argv, void *ctx)return 0 ; } - argc =parse_options (argc, argv, options, u,0 ); +parse_options (argc, argv, options, u,0 );if (opt_called)return 0 ;
test/dsa.c +6 -1
@@ -1468,6 +1468,8 @@ int task_result_verify(struct task *tsk, int mismatch_expected)return rc;case DSA_OPCODE_DIF_INS : rc =task_result_verify_dif (tsk, tsk->xfer_size, mismatch_expected); +if (rc !=ACCTEST_STATUS_OK ) +return rc; rc =task_result_verify_dif_tags (tsk, tsk->xfer_size);return rc;case DSA_OPCODE_DIF_STRP :
@@ -1477,6 +1479,9 @@ int task_result_verify(struct task *tsk, int mismatch_expected)case DSA_OPCODE_DIF_UPDT : rc =task_result_verify_dif (tsk, tsk->xfer_size -8 * tsk->blks, mismatch_expected); +if (rc !=ACCTEST_STATUS_OK ) +return rc; + rc =task_result_verify_dif_tags (tsk, tsk->xfer_size -8 * tsk->blks);return rc; }
@@ -1815,7 +1820,7 @@ static int task_result_verify_dif_page_fault(struct task *tsk, unsigned long xfeint task_result_verify_dif (struct task *tsk,unsigned long xfer_size,int mismatch_expected) { -int rc; +int rc =0 ;unsigned long i;unsigned long blks = tsk->blks;unsigned long buf_size = dif_blk_arr[tsk->blk_idx_flg];
test/dsa_prep.c +0 -1
@@ -610,7 +610,6 @@ void dsa_reprep_dif(struct acctest_context *ctx, struct task *tsk) hw->dest_ref_tag_seed = compl->dif_upd_dest_ref_tag; }if (tsk->opcode ==DSA_OPCODE_DIF_CHECK ) { - blks_completed = compl->bytes_completed / (dif_arr[tsk->blk_idx_flg] +8 ); hw->xfer_size -= compl->bytes_completed; hw->chk_app_tag_seed = compl->dif_chk_app_tag; hw->chk_ref_tag_seed = compl->dif_chk_ref_tag;
util/abspath.c +2 -7
@@ -7,14 +7,9 @@char *prefix_filename (const char *pfx,const char *arg) {struct strbuf path =STRBUF_INIT ; -size_t pfx_len = pfx ?strlen (pfx) :0 ; -if (!pfx_len) - ; -else if (is_absolute_path (arg)) - pfx_len =0 ; -else -strbuf_add (&path, pfx, pfx_len); +if (pfx && !is_absolute_path (arg)) +strbuf_add (&path, pfx,strlen (pfx));strbuf_addstr (&path, arg);return strbuf_detach (&path,NULL );
util/strbuf.c +2 -1
@@ -85,7 +85,8 @@ static void strbuf_splice(struct strbuf *sb, size_t pos, size_t len,memmove (sb->buf + pos + dlen, sb->buf + pos + len, sb->len - pos - len); -memcpy (sb->buf + pos, data, dlen); +if (data) +memcpy (sb->buf + pos, data, dlen);strbuf_setlen (sb, sb->len + dlen - len); }
Signature · 1 line
2.37.3