Skip to content

[PW_SID:1088820] riscv: cpuinfo: Fix NULL dereference and inconsistent error code #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
linux-riscv-bot wants to merge 1 commit into from
Closed

[PW_SID:1088820] riscv: cpuinfo: Fix NULL dereference and inconsistent error code #1857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions arch/riscv/kernel/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
Loading