mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Gregory Price <gourry@gourry.net>
To: linux-efi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, ardb@kernel.org, leitao@debian.org,
	usamaarif642@gmail.com,
	sathyanarayanan.kuppuswamy@linux.intel.com,
	ilias.apalodimas@linaro.org
Subject: [PATCH 4/6] tpm: sanity check the log version before using it
Date: Fri,  6 Sep 2024 16:27:43 -0400	[thread overview]
Message-ID: <20240906202745.11159-5-gourry@gourry.net> (raw)
In-Reply-To: <20240906202745.11159-1-gourry@gourry.net>

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


  parent reply	other threads:[~2024-09-06 20:28 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-06 20:27 [PATCH 0/6] libstub,tpm: fix small bugs and improve error reporting Gregory Price
2024-09-06 20:27 ` [PATCH 1/6] tpm: fix signed/unsigned bug when checking event logs Gregory Price
2024-09-06 20:27 ` [PATCH 2/6] tpm: do not ignore memblock_reserve return value Gregory Price
2024-09-13  7:02   ` Ilias Apalodimas
2024-09-13 12:58     ` Gregory Price
2024-09-06 20:27 ` [PATCH 3/6] libstub,tpm: provide indication of failure when getting event log Gregory Price
2024-09-13  6:59   ` Ilias Apalodimas
2024-09-13 12:57     ` Gregory Price
2024-09-13 13:10       ` Ilias Apalodimas
2024-09-13 23:06         ` Gregory Price
2024-09-06 20:27 ` Gregory Price [this message]
2024-09-13  6:40   ` [PATCH 4/6] tpm: sanity check the log version before using it Ilias Apalodimas
2024-09-13 12:56     ` Gregory Price
2024-09-13 13:39       ` Ilias Apalodimas
2024-09-13 13:44         ` Ard Biesheuvel
2024-09-13 13:47           ` Ard Biesheuvel
2024-09-13 14:03             ` Gregory Price
2024-09-06 20:27 ` [PATCH 5/6] tpm: fix unsigned/signed mismatch errors related to __calc_tpm2_event_size Gregory Price
2024-09-06 20:27 ` [PATCH 6/6] libstub,tpm: do not ignore failure case when reading final event log Gregory Price
2024-09-13 15:25   ` Ard Biesheuvel
2024-09-13 15:29     ` Gregory Price
2024-09-13 15:59       ` Ard Biesheuvel
2024-09-13 17:36         ` Gregory Price

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240906202745.11159-5-gourry@gourry.net \
    --to=gourry@gourry.net \
    --cc=ardb@kernel.org \
    --cc=ilias.apalodimas@linaro.org \
    --cc=leitao@debian.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sathyanarayanan.kuppuswamy@linux.intel.com \
    --cc=usamaarif642@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®