commit bd90f69bbaa299c9b8e5be448414775b7f6ce264
author Sandrine Bailleux <sandrine.bailleux@arm.com> Tue Jun 28 09:33:44 2022 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Jun 28 09:33:44 2022 +0200
tree 6ffa581acd15f5bde31daa88aed6697e3e7e75b2
parent 60bfe89874d330d920d2e4dccfd3e5483501015b
parent 6e836761fe8c2e44351b49aaa2470c8136e83e32

Merge "fix(measured-boot): clear the entire digest array of Startup Locality event" into integration

drivers/measured_boot/event_log/event_log.c

diff --git a/drivers/measured_boot/event_log/event_log.c b/drivers/measured_boot/event_log/event_log.c
index 792f235..abe469b 100644
--- a/drivers/measured_boot/event_log/event_log.c
+++ b/drivers/measured_boot/event_log/event_log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -180,6 +180,8 @@
 
 	/* event_log_init() must have been called prior to this. */
 	assert(log_ptr != NULL);
+	assert(((uintptr_t)log_ptr + ID_EVENT_SIZE + LOC_EVENT_SIZE) <
+		log_end);
 
 	/*
 	 * Add Specification ID Event first
@@ -219,7 +221,7 @@
 	((tpmt_ha *)ptr)->algorithm_id = TPM_ALG_ID;
 
 	/* TCG_PCR_EVENT2.Digests[].Digest[] */
-	(void)memset(&((tpmt_ha *)ptr)->digest, 0, TPM_ALG_ID);
+	(void)memset(&((tpmt_ha *)ptr)->digest, 0, TCG_DIGEST_SIZE);
 	ptr = (uint8_t *)((uintptr_t)ptr +
 			offsetof(tpmt_ha, digest) + TCG_DIGEST_SIZE);