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

include: fdt/fdt_helper: Change fdt_get_address() to return root.next_arg1

Browse Source 
In sbi_domain_finalize(), when locating the coldboot hart's domain,
the coldboot hart's scratch->arg1 will be overwritten by the domain
configuration. However scratch->arg1 holds the FDT address of the
coldboot hart, and is still being accessed by fdt_get_address() in
later boot process. scratch->arg1 could then contain completely
garbage and lead to a crash.

To fix this, we change fdt_get_address() to return root domain's
next_arg1 as the FDT pointer.

Resolves: https://github.com/riscv-software-src/opensbi/issues/281
Fixes: b1678af210 ("lib: sbi: Add initial domain support")
Reported-by: Marouene Boubakri <marouene.boubakri@nxp.com>
Signed-off-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Bin Meng
2023-02-23 18:40:09 +08:00
committed by Anup Patel
parent 745aaecc64
commit 99d09b601e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sbi_utils/fdt/fdt_helper.h
View File

@@ -11,7 +11,7 @@
#define __FDT_HELPER_H__ #define __FDT_HELPER_H__
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>
#include <sbi/sbi_scratch.h> #include <sbi/sbi_domain.h>
struct fdt_match { struct fdt_match {
const char *compatible; const char *compatible;
@@ -109,7 +109,7 @@ int fdt_parse_compat_addr(void *fdt, uint64_t *addr,
static inline void *fdt_get_address(void) static inline void *fdt_get_address(void)
{ {
return sbi_scratch_thishart_arg1_ptr(); return (void *)root.next_arg1;
} }
#endif /* __FDT_HELPER_H__ */ #endif /* __FDT_HELPER_H__ */