From: Peter Rajnoha Date: Mon, 27 Jun 2016 08:12:41 +0000 (+0200) Subject: coverity: fix issues detected in recent code X-Git-Tag: v2_02_159~86 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=f0768f636edb8da08e46b029380779fd623399de;p=lvm2.git coverity: fix issues detected in recent code Uninitialized variables (UNINIT) /safe/guest2/covscan/LVM2.2.02.158/tools/toollib.c: 3520 in _process_pvs_in_vgs() Uninitialized variables (UNINIT) Using uninitialized value "do_report_ret_code". Null pointer dereferences (REVERSE_INULL) /safe/guest2/covscan/LVM2.2.02.158/libdm/libdm-report.c: 4745 in dm_report_output() Null pointer dereferences (REVERSE_INULL) Null-checking "rh" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Incorrect expression (MISSING_COMMA) /safe/guest2/covscan/LVM2.2.02.158/lib/log/log.c: 280 in _get_log_level_name() Incorrect expression (MISSING_COMMA) In the initialization of "log_level_names", a suspicious concatenated string ""noticeinfo"" is produced. Null pointer dereferences (FORWARD_NULL) /safe/guest2/covscan/LVM2.2.02.158/tools/reporter.c: 816 in_get_report_options() Null pointer dereferences (FORWARD_NULL) Comparing "mem" to null implies that "mem" might be null. --- diff --git a/lib/log/log.c b/lib/log/log.c index b3453dc8b..30d71ef73 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -277,7 +277,7 @@ static const char *_get_log_level_name(int use_stderr, int level) "fatal", /* _LOG_FATAL */ "error", /* _LOG_ERROR */ "warn", /* _LOG_WARN */ - "notice" /* _LOG_NOTICE */ + "notice",/* _LOG_NOTICE */ "info", /* _LOG_INFO */ "debug" /* _LOG_DEBUG */ }; diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 6bea34cf8..ad03c6e28 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -4001,7 +4001,7 @@ static int _report_set_selection(struct dm_report *rh, const char *selection, in goto_bad; } - if (!selection || !strcasecmp(selection, SPECIAL_SELECTION_ALL)) + if (!selection || !selection[0] || !strcasecmp(selection, SPECIAL_SELECTION_ALL)) return 1; rh->selection->add_new_fields = add_new_fields; @@ -4742,7 +4742,7 @@ int dm_report_output(struct dm_report *rh) else r = _output_as_columns(rh); out: - if (r && rh && rh->group_item) + if (r && rh->group_item) rh->group_item->output_done = 1; return r; } diff --git a/tools/reporter.c b/tools/reporter.c index ee2d25163..40d449c10 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -815,7 +815,7 @@ static int _get_report_options(struct cmd_context *cmd, if (!(mem = dm_pool_create("report_options", 128))) { log_error("Failed to create temporary mempool to process report options."); - goto out; + return ECMD_FAILED; } if (single_args->report_type == CMDLOG) { diff --git a/tools/toollib.c b/tools/toollib.c index 5c61ddde9..80d0f32ba 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -3439,7 +3439,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, int skip; int notfound; int already_locked; - int do_report_ret_code; + int do_report_ret_code = 1; log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG);