Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: fix fdt_parse_plicsw_node()

Browse Source 
cpu_offset and cpu_intc_offset must be int to detect failed invocations of
fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not
cpu_intc_offset.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Xiang W <wxjstz@126.com>
Reviewed-by: Yu Chien Peter Lin <peterlin@andestech.com>
Reviewed-by: Bin Meng <bmeng@tinylab.org>
This commit is contained in:
Heinrich Schuchardt
2022-11-28 10:14:18 +01:00
committed by Anup Patel
parent e9bc7f1757
commit 5daa0ef087
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils/fdt/fdt_helper.c
View File

@@ -861,7 +861,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
{ {
const fdt32_t *val; const fdt32_t *val;
int rc, i, count; int rc, i, count;
uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset; uint64_t reg_addr, reg_size;
u32 phandle, hwirq, hartid, hcount; u32 phandle, hwirq, hartid, hcount;
if (nodeoffset < 0 || !fdt || !plicsw_base || if (nodeoffset < 0 || !fdt || !plicsw_base ||
@@ -882,6 +882,8 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
hcount = 0; hcount = 0;
for (i = 0; i < (count / 2); i++) { for (i = 0; i < (count / 2); i++) {
int cpu_offset, cpu_intc_offset;
phandle = fdt32_to_cpu(val[2 * i]); phandle = fdt32_to_cpu(val[2 * i]);
hwirq = fdt32_to_cpu(val[2 * i + 1]); hwirq = fdt32_to_cpu(val[2 * i + 1]);
@@ -890,7 +892,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
continue; continue;
cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset);
if (cpu_intc_offset < 0) if (cpu_offset < 0)
continue; continue;
rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid); rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);