archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OpenVariableRuntimeDxe: Add spoof proof UEFI 2.x checking (#405)

Browse Source
This commit is contained in:
dakanji 2022-12-04 19:11:33 +03:00 committed by GitHub
parent 7e5d2b7432
commit 47e800f750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Platform/OpenVariableRuntimeDxe/VariableDxe.c
View File

@ -648,8 +648,10 @@ VariableServiceInitialize (
)
{
EFI_STATUS Status;
EFI_EVENT ReadyToBootEvent;
UINTN OffsetQVI;
UINTN HeaderQVI;
EFI_EVENT EndOfDxeEvent;
EFI_EVENT ReadyToBootEvent;
EFI_CREATE_EVENT_EX OriginalCreateEventEx;
SaveAcpiGlobalVariable (SystemTable);
@ -684,8 +686,18 @@ VariableServiceInitialize (
//
// Avoid setting UEFI 2.x interface member on EFI 1.x.
//
if (SystemTable->RuntimeServices->Hdr.Revision >= EFI_2_00_SYSTEM_TABLE_REVISION) {
SystemTable->RuntimeServices->QueryVariableInfo = VariableServiceQueryVariableInfo;
// First test all systable elements as some may have been spoofed and pass a limited element check
// Then check that QueryVariableInfo is specifically available before setting the interface member
//
if ( ((SystemTable->Hdr.Revision >> 16U) > 1)
&& ((SystemTable->BootServices->Hdr.Revision >> 16U) > 1)
&& ((SystemTable->RuntimeServices->Hdr.Revision >> 16U) > 1))
{
OffsetQVI = OFFSET_OF (EFI_RUNTIME_SERVICES, QueryVariableInfo);
HeaderQVI = OffsetQVI + sizeof (SystemTable->RuntimeServices->QueryVariableInfo);
if (SystemTable->RuntimeServices->Hdr.HeaderSize >= HeaderQVI) {
SystemTable->RuntimeServices->QueryVariableInfo = VariableServiceQueryVariableInfo;
}
}
//