SecurityPkg/VariableAuthenticated: Check if there is a NV Variable Storage header prior to use its attributes
The Variable PEI and RuntimeDxe drivers were using the attribute 'HeaderLength' of EFI_FIRMWARE_VOLUME_HEADER without checking if a Firmware Volume Header was existing at the base address. In case the Firmware Volume Header does not exist or is corrupted, the attribute 'HeaderLength' is a non valid value that can lead to a non valid physical address when accessing produces an access error. Signed-off-by: oliviermartin Reviewed-by: rsun3 Reviewed-by: niruiyu git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12845 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1157,7 +1157,7 @@ VariableGetBestLanguage (
|
||||
|
||||
**/
|
||||
VOID
|
||||
AutoUpdateLangVariable(
|
||||
AutoUpdateLangVariable (
|
||||
IN CHAR16 *VariableName,
|
||||
IN VOID *Data,
|
||||
IN UINTN DataSize
|
||||
@@ -2616,6 +2616,17 @@ VariableCommonInitialize (
|
||||
if (TempVariableStoreHeader == 0) {
|
||||
TempVariableStoreHeader = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageVariableBase);
|
||||
}
|
||||
|
||||
//
|
||||
// Check if the Firmware Volume is not corrupted
|
||||
//
|
||||
if ((((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader))->Signature != EFI_FVH_SIGNATURE) ||
|
||||
(!CompareGuid (&gEfiSystemNvDataFvGuid, &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader))->FileSystemGuid))) {
|
||||
Status = EFI_VOLUME_CORRUPTED;
|
||||
DEBUG ((EFI_D_ERROR, "Firmware Volume for Variable Store is corrupted\n"));
|
||||
goto Done;
|
||||
}
|
||||
|
||||
VariableStoreBase = TempVariableStoreHeader + \
|
||||
(((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader)) -> HeaderLength);
|
||||
VariableStoreLength = (UINT64) PcdGet32 (PcdFlashNvStorageVariableSize) - \
|
||||
|
Reference in New Issue
Block a user