From: Karel Zak <kzak@redhat.com>
Date: Mon, 13 Jul 2026 10:15:16 +0000 (+0200)
Subject: lscpu: add NULL guards for RISC-V ISA functions [coverity: CID 503785]
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d44ece2fc3de876571888939c6075b6128cc2a27;p=thirdparty%2Futil-linux.git

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 f49aa3be4..929f0a36e 100644
--- 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 003ef22ce..deb9b12bd 100644
--- 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);
 }
 
 /*