uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e822c82b12 into fb2ac429de

Browse source
This commit is contained in:
Denis V. Lunev 2026-08-26 22:50:56 +00:00 • committed by GitHub
commit 6131b196f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
OvmfPkg/Library/PlatformInitLib/Platform.c
View file

@ -787,6 +787,8 @@ PlatformValidateNvVarStore (
UINTN VariableBase;
UINT32 VariableOffset;
UINT32 VariableOffsetBeforeAlign;
UINT32 VariableNameSize;
UINT32 VariableDataSize;
EFI_FIRMWARE_VOLUME_HEADER *NvVarStoreFvHeader;
VARIABLE_STORE_HEADER *NvVarStoreHeader;
AUTHENTICATED_VARIABLE_HEADER *VariableHeader;
@ -888,17 +890,26 @@ RETRY:
VariableOffset = NvVarStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);
} else {
if (!((VariableHeader->State == VAR_HEADER_VALID_ONLY) ||
(VariableHeader->State == VAR_ADDED) ||
(VariableHeader->State == (VAR_ADDED & VAR_DELETED)) ||
(VariableHeader->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION)) ||
(VariableHeader->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION & VAR_DELETED))))
{
DEBUG ((DEBUG_ERROR, "NvVarStore Variable header State was invalid.\n"));
return FALSE;
if (VariableHeader->State == 0xFF) {
DEBUG ((DEBUG_INFO, "NvVarStore variable header State is unwritten.\n"));
VariableNameSize = 0;
VariableDataSize = 0;
} else {
if (!((VariableHeader->State == VAR_HEADER_VALID_ONLY) ||
(VariableHeader->State == VAR_ADDED) ||
(VariableHeader->State == (VAR_ADDED & VAR_DELETED)) ||
(VariableHeader->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION)) ||
(VariableHeader->State == (VAR_ADDED & VAR_IN_DELETED_TRANSITION & VAR_DELETED))))
{
DEBUG ((DEBUG_ERROR, "NvVarStore Variable header State was invalid.\n"));
return FALSE;
}
VariableNameSize = VariableHeader->NameSize;
VariableDataSize = VariableHeader->DataSize;
}
VariableOffset += sizeof (AUTHENTICATED_VARIABLE_HEADER) + VariableHeader->NameSize + VariableHeader->DataSize;
VariableOffset += sizeof (AUTHENTICATED_VARIABLE_HEADER) + VariableNameSize + VariableDataSize;
// Verify VariableOffset should be less than or equal NvVarStoreHeader->Size - sizeof(VARIABLE_STORE_HEADER)
if (VariableOffset > (NvVarStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER))) {
DEBUG ((DEBUG_ERROR, "NvVarStore Variable header VariableOffset was invalid.\n"));
@ -992,7 +1003,7 @@ PlatformInitEmuVariableNvStore (
ASSERT (Size < EmuVariableNvStoreSize);
if (!PlatformValidateNvVarStore (Base, PcdGet32 (PcdCfvRawDataSize))) {
ASSERT (FALSE);
DEBUG ((DEBUG_ERROR, "Invalid FlashNvStorage, EmuVariableNvStore not initialized.\n"));
return EFI_INVALID_PARAMETER;
}