diff options
| author | Alexander Graf <agraf@suse.de> | 2018-09-26 14:07:41 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-09-26 15:03:12 +0200 |
| commit | eaac4fb296b1899369e49d941f2c0d346c7f5c7a (patch) | |
| tree | 93e6b1803cd091cde7645f43acd4449c70be31b6 /common | |
| parent | c982874e930d5d673501cd94df07bcbd215d5883 (diff) | |
sandbox: Fix set_working_fdt_addr users
When running sandbox with the new pointer sanitization we just recently
introduced, we're running into a case with FIT images where we end up
interpreting pointers as addresses.
What happened is that most callers of set_working_fdt_addr() simply
convert pointers into addresses without taking into account that they
might be 2 separate address spaces. Fix the callers up to map their
pointers into addresses.
This makes sandbox tests pass for me again.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 2 | ||||
| -rw-r--r-- | common/image-fdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/bootm.c b/common/bootm.c index e517d9f118a..8bf84ebcb7e 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -262,7 +262,7 @@ int bootm_find_images(int flag, int argc, char * const argv[]) puts("Could not find a valid device tree\n"); return 1; } - set_working_fdt_addr((ulong)images.ft_addr); + set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif #if IMAGE_ENABLE_FIT diff --git a/common/image-fdt.c b/common/image-fdt.c index 9b41f162484..95748f0ae10 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -193,7 +193,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len; - set_working_fdt_addr((ulong)*of_flat_tree); + set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0; error: |