From: Mohamed Ayman <mohamedaymanworkspace@gmail.com>
To: Paul Walmsley <pjw@kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Alexandre Ghiti <alex@ghiti.fr>,
Andrew Jones <ajones@ventanamicro.com>,
Conor Dooley <conor.dooley@microchip.com>,
Anup Patel <apatel@ventanamicro.com>,
Mohamed Ayman <mohamedaymanworkspace@gmail.com>,
linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE),
linux-kernel@vger.kernel.org (open list)
Cc: linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] riscv: cpuinfo: Fix NULL dereference and inconsistent error code
Date: Sat, 2 May 2026 19:02:57 +0300 [thread overview]
Message-ID: <20260502160301.453029-1-mohamedaymanworkspace@gmail.com> (raw)
Fix a potential NULL pointer dereference in c_show() by ensuring
the device tree node returned by of_get_cpu_node() is checked before use.
Also replace a non-standard return value (-1) in
riscv_of_parent_hartid() with -ENODEV to follow Linux kernel
conventions for "not found" error returns.
Both issues improve robustness and consistency with existing RISC-V CPU info handling code.
---
arch/riscv/kernel/cpu.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
index 3dbc8cc557dd..e0bc7526861f 100644
--- a/arch/riscv/kernel/cpu.c
+++ b/arch/riscv/kernel/cpu.c
@@ -135,7 +135,7 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid)
}
}
- return -1;
+ return -ENODEV;
}
unsigned long __init riscv_get_marchid(void)
@@ -348,12 +348,13 @@ static int c_show(struct seq_file *m, void *v)
if (acpi_disabled) {
node = of_get_cpu_node(cpu_id, NULL);
+ if (node) {
+ if (!of_property_read_string(node, "compatible", &compat) &&
+ strcmp(compat, "riscv"))
+ seq_printf(m, "uarch\t\t: %s\n", compat);
- if (!of_property_read_string(node, "compatible", &compat) &&
- strcmp(compat, "riscv"))
- seq_printf(m, "uarch\t\t: %s\n", compat);
-
- of_node_put(node);
+ of_node_put(node);
+ }
}
seq_printf(m, "mvendorid\t: 0x%lx\n", ci->mvendorid);
--
2.34.1
next reply other threads:[~2026-05-02 16:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-02 16:02 Mohamed Ayman [this message]
2026-05-03 17:54 ` [PATCH] riscv: cpuinfo: Fix NULL dereference and inconsistent error code Conor Dooley
-- strict thread matches above, loose matches on Subject: below --
2026-05-02 16:17 Mohamed Ayman
2026-05-03 12:26 ` Michael Ellerman
2026-05-03 16:11 ` MOHAMED AYMAN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260502160301.453029-1-mohamedaymanworkspace@gmail.com \
--to=mohamedaymanworkspace@gmail.com \
--cc=ajones@ventanamicro.com \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=apatel@ventanamicro.com \
--cc=conor.dooley@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox