OvmfPkg/AmdSev/SecretDxe: Allocate secret location as EfiACPIReclaimMemory

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4186

Commit 079a58276b ("OvmfPkg/AmdSev/SecretPei: Mark SEV launch secret
area as reserved") marked the launch secret area itself (1 page) as
reserved so the guest OS can use it during the lifetime of the OS.
However, the address and size of the secret area held in the
CONFIDENTIAL_COMPUTING_SECRET_LOCATION struct are declared as STATIC in
OVMF (in AmdSev/SecretDxe); therefore there's no guarantee that it will
not be written over by OS data.

Fix this by allocating the memory for the
CONFIDENTIAL_COMPUTING_SECRET_LOCATION struct with the
EfiACPIReclaimMemory memory type to ensure the guest OS will not reuse
this memory.

Fixes: 079a58276b ("OvmfPkg/AmdSev/SecretPei: Mark SEV launch secret ...")
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Dov Murik 2022-12-15 13:11:51 +00:00 committed by mergify[bot]
parent 3e3f5bb21c
commit 0adc35fccd
1 changed files with 16 additions and 6 deletions

View File

@ -8,11 +8,6 @@
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Guid/ConfidentialComputingSecret.h> #include <Guid/ConfidentialComputingSecret.h>
STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION mSecretDxeTable = {
FixedPcdGet32 (PcdSevLaunchSecretBase),
FixedPcdGet32 (PcdSevLaunchSecretSize),
};
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
InitializeSecretDxe ( InitializeSecretDxe (
@ -20,8 +15,23 @@ InitializeSecretDxe (
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
) )
{ {
EFI_STATUS Status;
CONFIDENTIAL_COMPUTING_SECRET_LOCATION *SecretDxeTable;
Status = gBS->AllocatePool (
EfiACPIReclaimMemory,
sizeof (CONFIDENTIAL_COMPUTING_SECRET_LOCATION),
(VOID **)&SecretDxeTable
);
if (EFI_ERROR (Status)) {
return Status;
}
SecretDxeTable->Base = FixedPcdGet32 (PcdSevLaunchSecretBase);
SecretDxeTable->Size = FixedPcdGet32 (PcdSevLaunchSecretSize);
return gBS->InstallConfigurationTable ( return gBS->InstallConfigurationTable (
&gConfidentialComputingSecretGuid, &gConfidentialComputingSecretGuid,
&mSecretDxeTable SecretDxeTable
); );
} }