Skip to contentSkip to conversation

sandbox: Fix set_working_fdt_addr users

PATCH New Alexander Graf 2 participants 2 messages Sep 26, 2018 – Sep 27, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---

v1 -> v2:

- convert callers instead of API, as the main user of set_working_fdt_addr() is address based

---
 common/bootm.c     | 2 +-
 common/image-fdt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
common/bootm.c +1 -1
index e517d9f118..8bf84ebcb7 100644
@@ -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
common/image-fdt.c +1 -1
index 9b41f16248..95748f0ae1 100644
@@ -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:
Signature · 1 line
2.12.3
#1 lore raw

PATCH v2 1/1 sandbox: Fix set_working_fdt_addr users

Quoted 15 lines · Alexander Graf

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.

---

Quoted 8 lines

v1 -> v2:

- convert callers instead of API, as the main user of set_working_fdt_addr() is address based

---
 common/bootm.c     | 2 +-
 common/image-fdt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)