Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-24 18:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

riscv: fix FDT length check and FDT pointer type

Browse Source 
Fix incorrect comparison between fdt_getprop() length (bytes)
and address cells count.
The check now uses ac * sizeof(uint32_t) to avoid
reading invalid data.

Also change FDT pointer type from const char * to const void *
to match libfdt API.

No functional changes.
This commit is contained in:
Mohamed Ayman
2026-05-15 14:46:48 +00:00
committed by Gedare Bloom
parent 3cb2e57560
commit 8f59e18ea3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsps/riscv/riscv/start/bspstart.c
+9 -3
View File
@@ -38,6 +38,7 @@ void *riscv_fdt_get_address(const void *fdt, int node)
{
int parent;
int ac;
int sc;
int len;
const uint32_t *reg;
uint64_t addr;
@@ -52,8 +53,13 @@ void *riscv_fdt_get_address(const void *fdt, int node)
return NULL;
}
sc = fdt_size_cells(fdt, parent);
if (sc < 0) {
return NULL;
}
reg = fdt_getprop(fdt, node, "reg", &len);
if (reg == NULL || len < ac) {
if (reg == NULL || len < (int)((ac + sc) * sizeof(*reg))) {
return NULL;
}
@@ -185,7 +191,7 @@ static uint32_t get_core_frequency(void)
{
#if RISCV_ENABLE_FRDME310ARTY_SUPPORT != 0 || RISCV_ENABLE_MPFS_SUPPORT != 0
uint32_t node;
const char *fdt;
const void *fdt;
const char *tlclk;
int len;
const fdt32_t *val;
@@ -240,7 +246,7 @@ uint32_t k210_get_frequency(void)
uint32_t clk_freq;
uint32_t pll0, nr, nf, od;
uint32_t node;
const char *fdt;
const void *fdt;
const fdt32_t *val;
int len;