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

OcBootManagementLib: Add guard for static mImageLoaderCaps

Browse Source
This commit is contained in:
Mike Beaton 2023-10-29 13:03:26 +00:00
parent 909008c987
commit c6060b25bb
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/OcBootManagementLib/ImageLoader.c
View File

@ -78,6 +78,7 @@ STATIC EFI_HANDLE mCurrentImageHandle;
STATIC OC_IMAGE_LOADER_PATCH mImageLoaderPatch;
STATIC OC_IMAGE_LOADER_CONFIGURE mImageLoaderConfigure;
STATIC UINT32 mImageLoaderCaps;
STATIC EFI_HANDLE mImageLoaderCapsHandle;
STATIC BOOLEAN mImageLoaderEnabled;
STATIC BOOLEAN mProtectUefiServices;
@ -773,6 +774,8 @@ InternalEfiLoadImage (
VOID *AllocatedBuffer;
UINT32 RealSize;
mImageLoaderCapsHandle = NULL;
if ((ParentImageHandle == NULL) || (ImageHandle == NULL)) {
return EFI_INVALID_PARAMETER;
}
@ -924,6 +927,8 @@ InternalEfiLoadImage (
InternalUpdateLoadedImage (*ImageHandle, DevicePath);
}
mImageLoaderCapsHandle = *ImageHandle;
return Status;
}
@ -940,6 +945,13 @@ InternalEfiStartImage (
OC_LOADED_IMAGE_PROTOCOL *OcLoadedImage;
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
if ( (mImageLoaderConfigure != NULL)
&& (ImageHandle != mImageLoaderCapsHandle))
{
DEBUG ((DEBUG_ERROR, "OCB: load/start unsupported ordering, %p != %p\n", ImageHandle, mImageLoaderCapsHandle));
return EFI_INVALID_PARAMETER;
}
//
// If we loaded the image, invoke the entry point manually.
//