linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ardb@kernel.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: Ard Biesheuvel <ardb@kernel.org>,
	linux-kernel@vger.kernel.org,
	David Hildenbrand <david@redhat.com>,
	Heinrich Schuchardt <xypron.glpk@gmx.de>,
	Tom Lendacky <thomas.lendacky@amd.com>
Subject: [PATCH 1/6] efi/x86: Add TPM related EFI tables to unencrypted mapping checks
Date: Fri, 28 Feb 2020 13:14:03 +0100	[thread overview]
Message-ID: <20200228121408.9075-2-ardb@kernel.org> (raw)
In-Reply-To: <20200228121408.9075-1-ardb@kernel.org>

From: Tom Lendacky <thomas.lendacky@amd.com>

When booting with SME active, EFI tables must be mapped unencrypted since
they were built by UEFI in unencrypted memory. Update the list of tables
to be checked during early_memremap() processing to account for the EFI
TPM tables.

This fixes a bug where an EFI TPM log table has been created by UEFI, but
it lives in memory that has been marked as usable rather than reserved.

Cc: <stable@vger.kernel.org> # v5.4+
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/4144cd813f113c20cdfa511cf59500a64e6015be.1582662842.git.thomas.lendacky@amd.com
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 arch/x86/platform/efi/efi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 43b24e149312..0a8117865430 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -88,6 +88,8 @@ static const unsigned long * const efi_tables[] = {
 #ifdef CONFIG_EFI_RCI2_TABLE
 	&rci2_table_phys,
 #endif
+	&efi.tpm_log,
+	&efi.tpm_final_log,
 };
 
 u64 efi_setup;		/* efi setup_data physical address */
-- 
2.17.1


  reply	other threads:[~2020-02-28 12:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28 12:14 [GIT PULL 0/6] More EFI updates for v5.7 Ard Biesheuvel
2020-02-28 12:14 ` Ard Biesheuvel [this message]
2020-02-28 12:14 ` [PATCH 2/6] efi/x86: Add RNG seed EFI table to unencrypted mapping check Ard Biesheuvel
2020-02-28 12:14 ` [PATCH 3/6] efi: don't shadow i in efi_config_parse_tables() Ard Biesheuvel
2020-02-28 12:14 ` [PATCH 4/6] efi/arm: clean EFI stub exit code from cache instead of avoiding it Ard Biesheuvel
2020-02-28 12:14 ` [PATCH 5/6] efi/arm64: " Ard Biesheuvel
2020-02-28 12:14 ` [PATCH 6/6] efi: mark all EFI runtime services as unsupported on non-EFI boot Ard Biesheuvel
2020-03-04 22:48 ` [GIT PULL 0/6] More EFI updates for v5.7 Ard Biesheuvel

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=20200228121408.9075-2-ardb@kernel.org \
    --to=ardb@kernel.org \
    --cc=david@redhat.com \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=thomas.lendacky@amd.com \
    --cc=xypron.glpk@gmx.de \
    /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;
as well as URLs for NNTP newsgroup(s).