sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmbeddedPkg: AndroidBootImgBoot error handling updates

Browse Source 
Update AndroidBootImgBoot to use a single return point
Make sure Kernel args are freed and Image is unloaded.

Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
This commit is contained in:
Jeff Brasen
2021-09-13 23:18:49 +00:00
committed by mergify[bot]
parent fdeff3fdae
commit f2a7e24e38
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
View File

@ -382,10 +382,13 @@ AndroidBootImgBoot (
UINTN RamdiskSize; UINTN RamdiskSize;
IN VOID *FdtBase; IN VOID *FdtBase;
NewKernelArg = NULL;
ImageHandle = NULL;
Status = gBS->LocateProtocol (&gAndroidBootImgProtocolGuid, NULL, Status = gBS->LocateProtocol (&gAndroidBootImgProtocolGuid, NULL,
(VOID **) &mAndroidBootImg); (VOID **) &mAndroidBootImg);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; goto Exit;
} }
Status = AndroidBootImgGetKernelInfo ( Status = AndroidBootImgGetKernelInfo (
@ -394,19 +397,19 @@ AndroidBootImgBoot (
&KernelSize &KernelSize
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; goto Exit;
} }
NewKernelArg = AllocateZeroPool (ANDROID_BOOTIMG_KERNEL_ARGS_SIZE); NewKernelArg = AllocateZeroPool (ANDROID_BOOTIMG_KERNEL_ARGS_SIZE);
if (NewKernelArg == NULL) { if (NewKernelArg == NULL) {
DEBUG ((DEBUG_ERROR, "Fail to allocate memory\n")); DEBUG ((DEBUG_ERROR, "Fail to allocate memory\n"));
return EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Exit;
} }
Status = AndroidBootImgUpdateArgs (Buffer, NewKernelArg); Status = AndroidBootImgUpdateArgs (Buffer, NewKernelArg);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (NewKernelArg); goto Exit;
return Status;
} }
Status = AndroidBootImgGetRamdiskInfo ( Status = AndroidBootImgGetRamdiskInfo (
@ -415,19 +418,17 @@ AndroidBootImgBoot (
&RamdiskSize &RamdiskSize
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; goto Exit;
} }
Status = AndroidBootImgLocateFdt (Buffer, &FdtBase); Status = AndroidBootImgLocateFdt (Buffer, &FdtBase);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (NewKernelArg); goto Exit;
return Status;
} }
Status = AndroidBootImgUpdateFdt (Buffer, FdtBase, RamdiskData, RamdiskSize); Status = AndroidBootImgUpdateFdt (Buffer, FdtBase, RamdiskData, RamdiskSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
FreePool (NewKernelArg); goto Exit;
return Status;
} }
KernelDevicePath = mMemoryDevicePathTemplate; KernelDevicePath = mMemoryDevicePathTemplate;
@ -440,21 +441,15 @@ AndroidBootImgBoot (
(EFI_DEVICE_PATH *)&KernelDevicePath, (EFI_DEVICE_PATH *)&KernelDevicePath,
(VOID*)(UINTN)Kernel, KernelSize, &ImageHandle); (VOID*)(UINTN)Kernel, KernelSize, &ImageHandle);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
// goto Exit;
// With EFI_SECURITY_VIOLATION retval, the Image was loaded and an ImageHandle was created
// with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can not be started right now.
// If the caller doesn't have the option to defer the execution of an image, we should
// unload image for the EFI_SECURITY_VIOLATION to avoid resource leak.
//
if (Status == EFI_SECURITY_VIOLATION) {
gBS->UnloadImage (ImageHandle);
}
return Status;
} }
// Set kernel arguments // Set kernel arguments
Status = gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid, Status = gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid,
(VOID **) &ImageInfo); (VOID **) &ImageInfo);
if (EFI_ERROR (Status)) {
goto Exit;
}
ImageInfo->LoadOptions = NewKernelArg; ImageInfo->LoadOptions = NewKernelArg;
ImageInfo->LoadOptionsSize = StrLen (NewKernelArg) * sizeof (CHAR16); ImageInfo->LoadOptionsSize = StrLen (NewKernelArg) * sizeof (CHAR16);
@ -464,5 +459,18 @@ AndroidBootImgBoot (
Status = gBS->StartImage (ImageHandle, NULL, NULL); Status = gBS->StartImage (ImageHandle, NULL, NULL);
// Clear the Watchdog Timer if the image returns // Clear the Watchdog Timer if the image returns
gBS->SetWatchdogTimer (0, 0x10000, 0, NULL); gBS->SetWatchdogTimer (0, 0x10000, 0, NULL);
return EFI_SUCCESS;
Exit:
//Unload image as it will not be used anymore
if (ImageHandle != NULL) {
gBS->UnloadImage (ImageHandle);
ImageHandle = NULL;
}
if (EFI_ERROR (Status)) {
if (NewKernelArg != NULL) {
FreePool (NewKernelArg);
NewKernelArg = NULL;
}
}
return Status;
} }