diff mbox series

[Concept,05/24] tpm: Correct address handling in tcg2_platform_get_log()

Message ID 20251018084117.1798704-6-sjg@u-boot.org
State New
Headers
Series bootctl: Expand bootctl to include a new UI |

Commit Message

Simon Glass Oct. 18, 2025, 8:40 a.m. UTC 
  From: Simon Glass <sjg@chromium.org>

This function assumes that an address is the same as a pointer. Use
map_sysmem() to fix this, which crashes on sandbox.

Rename the parameter from addr to ptr, to avoid further confusion.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 include/tpm_tcg2.h |  4 ++--
 lib/tpm_tcg2.c     | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/include/tpm_tcg2.h b/include/tpm_tcg2.h
index 189a93ee840..e305bc29a95 100644
--- a/include/tpm_tcg2.h
+++ b/include/tpm_tcg2.h
@@ -313,12 +313,12 @@  void tcg2_measurement_term(struct udevice *dev, struct tcg2_event_log *elog,
  * Get the platform event log address and size.
  *
  * @dev		TPM device
- * @addr	Address of the log
+ * @addr	Pointer to the log
  * @size	Size of the log
  *
  * Return: zero on success, negative errno otherwise
  */
-int tcg2_platform_get_log(struct udevice *dev, void **addr, u32 *size);
+int tcg2_platform_get_log(struct udevice *dev, void **ptrp, u32 *sizep);
 
 /**
  * Get the first TPM2 device found.
diff --git a/lib/tpm_tcg2.c b/lib/tpm_tcg2.c
index 364f7287438..bcd3423d923 100644
--- a/lib/tpm_tcg2.c
+++ b/lib/tpm_tcg2.c
@@ -671,7 +671,7 @@  void tcg2_measurement_term(struct udevice *dev, struct tcg2_event_log *elog,
 		unmap_physmem(elog->log, MAP_NOCACHE);
 }
 
-__weak int tcg2_platform_get_log(struct udevice *dev, void **addr, u32 *size)
+__weak int tcg2_platform_get_log(struct udevice *dev, void **ptrp, u32 *sizep)
 {
 	const __be32 *addr_prop = NULL;
 	const __be32 *size_prop = NULL;
@@ -680,13 +680,14 @@  __weak int tcg2_platform_get_log(struct udevice *dev, void **addr, u32 *size)
 	struct ofnode_phandle_args args;
 	phys_addr_t a;
 	fdt_size_t s;
+	void *ptr;
+	int size;
 
-	*addr = NULL;
-	*size = 0;
+	ptr = bloblist_get_blob(BLOBLISTT_TPM_EVLOG, &size);
+	if (ptr && size) {
+		ulong addr = map_to_sysmem(ptr);
 
-	*addr = bloblist_get_blob(BLOBLISTT_TPM_EVLOG, size);
-	if (*addr && *size) {
-		*addr = map_physmem((uintptr_t)(*addr), *size, MAP_NOCACHE);
+		*ptrp = map_physmem(addr, size, MAP_NOCACHE);
 		return 0;
 	}
 
@@ -714,8 +715,8 @@  __weak int tcg2_platform_get_log(struct udevice *dev, void **addr, u32 *size)
 		u64 a = of_read_number(addr_prop, asize / sizeof(__be32));
 		u64 s = of_read_number(size_prop, ssize / sizeof(__be32));
 
-		*addr = map_physmem(a, s, MAP_NOCACHE);
-		*size = (u32)s;
+		*ptrp = map_physmem(a, s, MAP_NOCACHE);
+		*sizep = (u32)s;
 
 		return 0;
 	}
@@ -727,8 +728,8 @@  __weak int tcg2_platform_get_log(struct udevice *dev, void **addr, u32 *size)
 	if (a == FDT_ADDR_T_NONE)
 		return -ENOMEM;
 
-	*addr = map_physmem(a, s, MAP_NOCACHE);
-	*size = (u32)s;
+	*ptrp = map_physmem(a, s, MAP_NOCACHE);
+	*sizep = (u32)s;
 
 	return 0;
 }