tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/PlatformPei: Validate SEC's GHCB page 

When running under SEV-ES, a page of shared memory is allocated for the
GHCB during the SEC phase at address 0x809000. This page of memory is
eventually passed to the OS as EfiConventionalMemory. When running
SEV-SNP, this page is not PVALIDATE'd in the RMP table, meaning that if
the guest OS tries to access the page, it will think that the host has
voilated the security guarantees and will likely crash.

This patch validates this page immediately after EDK2 switches to using
the GHCB page allocated for the PEI phase.

This was tested by writing a UEFI application that reads to and writes
from one byte of each page of memory and checks to see if a #VC
exception is generated indicating that the page was not validated.

Fixes: 6995a1b79b ("OvmfPkg: Create a GHCB page for use during Sec phase")

Signed-off-by: Adam Dunlap <acdunlap@google.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
This commit is contained in:
Adam Dunlap 2022-12-10 05:04:16 +08:00 committed by mergify[bot]
parent 01c0d3c0d5
commit 3e3f5bb21c
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OvmfPkg/PlatformPei/AmdSev.c
View File

@ -212,7 +212,7 @@ AmdSevEsInitialize (
UINTN GhcbBackupPageCount; UINTN GhcbBackupPageCount;
SEV_ES_PER_CPU_DATA *SevEsData; SEV_ES_PER_CPU_DATA *SevEsData;
UINTN PageCount; UINTN PageCount;
RETURN_STATUS PcdStatus, DecryptStatus; RETURN_STATUS Status;
IA32_DESCRIPTOR Gdtr; IA32_DESCRIPTOR Gdtr;
VOID *Gdt; VOID *Gdt;
@ -220,8 +220,8 @@ AmdSevEsInitialize (
return; return;
} }
PcdStatus = PcdSetBoolS (PcdSevEsIsEnabled, TRUE); Status = PcdSetBoolS (PcdSevEsIsEnabled, TRUE);
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (Status);
// //
// Allocate GHCB and per-CPU variable pages. // Allocate GHCB and per-CPU variable pages.
@ -240,20 +240,20 @@ AmdSevEsInitialize (
// only clear the encryption mask for the GHCB pages. // only clear the encryption mask for the GHCB pages.
// //
for (PageCount = 0; PageCount < GhcbPageCount; PageCount += 2) { for (PageCount = 0; PageCount < GhcbPageCount; PageCount += 2) {
DecryptStatus = MemEncryptSevClearPageEncMask ( Status = MemEncryptSevClearPageEncMask (
0, 0,
GhcbBasePa + EFI_PAGES_TO_SIZE (PageCount), GhcbBasePa + EFI_PAGES_TO_SIZE (PageCount),
1 1
); );
ASSERT_RETURN_ERROR (DecryptStatus); ASSERT_RETURN_ERROR (Status);
} }
ZeroMem (GhcbBase, EFI_PAGES_TO_SIZE (GhcbPageCount)); ZeroMem (GhcbBase, EFI_PAGES_TO_SIZE (GhcbPageCount));
PcdStatus = PcdSet64S (PcdGhcbBase, GhcbBasePa); Status = PcdSet64S (PcdGhcbBase, GhcbBasePa);
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (Status);
PcdStatus = PcdSet64S (PcdGhcbSize, EFI_PAGES_TO_SIZE (GhcbPageCount)); Status = PcdSet64S (PcdGhcbSize, EFI_PAGES_TO_SIZE (GhcbPageCount));
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (Status);
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
@ -295,6 +295,20 @@ AmdSevEsInitialize (
AsmWriteMsr64 (MSR_SEV_ES_GHCB, GhcbBasePa); AsmWriteMsr64 (MSR_SEV_ES_GHCB, GhcbBasePa);
//
// Now that the PEI GHCB is set up, the SEC GHCB page is no longer necessary
// to keep shared. Later, it is exposed to the OS as EfiConventionalMemory, so
// it needs to be marked private. The size of the region is hardcoded in
// OvmfPkg/ResetVector/ResetVector.nasmb in the definition of
// SNP_SEC_MEM_BASE_DESC_2.
//
Status = MemEncryptSevSetPageEncMask (
0, // Cr3 -- use system Cr3
FixedPcdGet32 (PcdOvmfSecGhcbBase), // BaseAddress
1 // NumPages
);
ASSERT_RETURN_ERROR (Status);
// //
// The SEV support will clear the C-bit from non-RAM areas. The early GDT // The SEV support will clear the C-bit from non-RAM areas. The early GDT
// lives in a non-RAM area, so when an exception occurs (like a #VC) the GDT // lives in a non-RAM area, so when an exception occurs (like a #VC) the GDT