From aae506ce44d699f10f78c57fea943fac101ec897 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Wed, 3 Feb 2021 16:09:58 +0100 Subject: [PATCH] UefiPayloadPkg/BlSMMStoreDxe: Support Secureboot Signed-off-by: Patrick Rudolph --- UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreFvbDxe.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreFvbDxe.c b/UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreFvbDxe.c index 3370edfeed..d443fcee21 100644 --- a/UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreFvbDxe.c +++ b/UefiPayloadPkg/BlSMMStoreDxe/BlSMMStoreFvbDxe.c @@ -103,7 +103,11 @@ InitializeFvAndVariableStoreHeaders ( // VARIABLE_STORE_HEADER // VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)Headers + FirmwareVolumeHeader->HeaderLength); - CopyGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid); + // + // Should be gEfiVariableGuid as SMM doesn't authenticate, but userspace does + // Must be gEfiAuthenticatedVariableGuid for SecureBoot + // + CopyGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid); VariableStoreHeader->Size = PcdGet32(PcdFlashNvStorageVariableSize) - FirmwareVolumeHeader->HeaderLength; VariableStoreHeader->Format = VARIABLE_STORE_FORMATTED; VariableStoreHeader->State = VARIABLE_STORE_HEALTHY;