[PATCH 4/6] tpm: sanity check the log version before using it

Gregory Price
2024-09-06T20:28:25Z

If the log version is not sane (0 or >2), don't attempt to use
the rest of the log values for anything to avoid potential corruption.

Signed-off-by: Gregory Price <gourry@gourry.net>
---
drivers/firmware/efi/tpm.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c
index 6e03eed0dc6f..9a080887a3e0 100644
--- a/drivers/firmware/efi/tpm.c
+++ b/drivers/firmware/efi/tpm.c
@@ -60,6 +60,15 @@ int __init efi_tpm_eventlog_init(void)
return -ENOMEM;
}

+ if (!log_tbl->version ||
+ log_tbl->version > EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) {
+ pr_err(FW_BUG "TPM Events table version invalid (%x)\n",
+ log_tbl->version);
+ early_memunmap(log_tbl, sizeof(*log_tbl));
+ efi.tpm_log = EFI_INVALID_TABLE_ADDR;
+ return -EINVAL;
+ }
+
tbl_size = sizeof(*log_tbl) + log_tbl->size;
if (memblock_reserve(efi.tpm_log, tbl_size)) {
pr_err("TPM Event Log memblock reserve fails (0x%lx, 0x%x)\n",
--
2.43.0