Re: [PATCH v2] x86/efi: Add additional efi tables for unencrypted mapping checks

From: Tom Lendacky
Date: Tue Feb 25 2020 - 12:54:32 EST


On 2/25/20 11:45 AM, Ard Biesheuvel wrote:
> On Tue, 25 Feb 2020 at 18:41, Tom Lendacky <thomas.lendacky@xxxxxxx> wrote:
>>
>> 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 new EFI
>> 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.
>>
>> Signed-off-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
>>
>> ---
>> Changes since v1:
>> - Re-spun against EFI tree
>
> Which one? Surely not the one in the link I included?

I did a git clone of

git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git

and checked out branch next. Not sure what I missed...

Thanks,
Tom

>
>> ---
>> arch/x86/platform/efi/efi.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
>> index 43b24e149312..c6ca959e2366 100644
>> --- a/arch/x86/platform/efi/efi.c
>> +++ b/arch/x86/platform/efi/efi.c
>> @@ -88,6 +88,9 @@ static const unsigned long * const efi_tables[] = {
>> #ifdef CONFIG_EFI_RCI2_TABLE
>> &rci2_table_phys,
>> #endif
>> + &efi.rng_seed,
>> + &efi.tpm_log,
>> + &efi.tpm_final_log,
>> };
>>
>> u64 efi_setup; /* efi setup_data physical address */
>> --
>> 2.17.1
>>