lscpu: add NULL guards for RISC-V ISA functions [coverity: CID 503785]

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/lscpu-riscv.c b/sys-utils/lscpu-riscv.c
index f49aa3be48ce49f90a9f5e045c1a9a44d9160c20..929f0a36e69a951c9d304edb31c542e60d7f5f0f 100644 (file)
--- a/sys-utils/lscpu-riscv.c
+++ b/sys-utils/lscpu-riscv.c
@@ -19,6 +19,9 @@ bool is_riscv(struct lscpu_cputype *ct)
        const char *base_isa[] = {"rv32", "rv64", "rv128"};
        size_t i;
 
+       if (!ct->isa)
+               return false;
+
        for (i = 0; i < ARRAY_SIZE(base_isa); i++) {
                if (!c_strncasecmp(ct->isa, base_isa[i], strlen(base_isa[i])))
                        return true;
@@ -35,6 +38,9 @@ void lscpu_format_isa_riscv(struct lscpu_cputype *ct)
        char **split;
        size_t i;
 
+       if (!ct->isa)
+               return;
+
        split = ul_strv_split(ct->isa, "_");
 
        /* Keep the kernel-provided ISA extension order. */

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 003ef22ced0057364ebc153110558d08f82a44a7..deb9b12bdccce434ed65cb0517f035d54974f3bc 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -975,13 +975,12 @@ print_summary_cputype(struct lscpu_cxt *cxt,
        if (ct->flags)
                add_summary_s(tb, sec, _("Flags:"), ct->flags);
 
-       if (ct->isa && is_riscv(ct)) {
+       if (is_riscv(ct)) {
                lscpu_format_isa_riscv(ct);
                add_summary_s(tb, sec, _("ISA:"), ct->isa);
+               if (ct->mmu)
+                       add_summary_s(tb, sec, _("MMU:"), ct->mmu);
        }
-
-       if (ct->mmu && is_riscv(ct))
-               add_summary_s(tb, sec, _("MMU:"), ct->mmu);
 }
 
 /*