From eb812a497e7fc0357dd7d2598d9ab36eefb6c375 Mon Sep 17 00:00:00 2001 From: Mohamed Ayman Date: Sat, 2 May 2026 19:17:58 +0300 Subject: [PATCH] riscv: cpuinfo: Fix NULL dereference and inconsistent error code 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. v2: Add missing Signed-off-by Signed-off-by: Mohamed Ayman Signed-off-by: Linux RISC-V bot --- 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 3dbc8cc557dd1d..e0bc7526861fe1 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);