tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EmbeddedPkg: Improve LocateAndInstallAcpiFromFvConditional 

LocateAndInstallAcpiFromFvConditional was always returning EFI_SUCCESS
even when it failed to find `AcpiFile`. Fix that, and improve the layout
by checking if an error occurred and breaking earlier.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
This commit is contained in:
Rebecca Cran 2024-04-28 16:02:16 -06:00 committed by mergify[bot]
parent 5aa6842715
commit a1b0703e8e
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
EmbeddedPkg/Library/AcpiLib/AcpiLib.c
View File

@ -52,6 +52,9 @@ LocateAndInstallAcpiFromFvConditional (
UINTN AcpiTableSize; UINTN AcpiTableSize;
UINTN AcpiTableKey; UINTN AcpiTableKey;
BOOLEAN Valid; BOOLEAN Valid;
BOOLEAN FoundAcpiFile;
FoundAcpiFile = FALSE;
// Ensure the ACPI Table is present // Ensure the ACPI Table is present
Status = gBS->LocateProtocol ( Status = gBS->LocateProtocol (
@ -107,7 +110,13 @@ LocateAndInstallAcpiFromFvConditional (
&SectionSize, &SectionSize,
&FvStatus &FvStatus
); );
if (!EFI_ERROR (Status)) {
if (EFI_ERROR (Status)) {
break;
}
FoundAcpiFile = TRUE;
AcpiTableKey = 0; AcpiTableKey = 0;
AcpiTableSize = ((EFI_ACPI_DESCRIPTION_HEADER *)AcpiTable)->Length; AcpiTableSize = ((EFI_ACPI_DESCRIPTION_HEADER *)AcpiTable)->Length;
ASSERT (SectionSize >= AcpiTableSize); ASSERT (SectionSize >= AcpiTableSize);
@ -122,7 +131,7 @@ LocateAndInstallAcpiFromFvConditional (
)); ));
// Is the ACPI table valid? // Is the ACPI table valid?
if (CheckAcpiTableFunction) { if (CheckAcpiTableFunction != NULL) {
Valid = CheckAcpiTableFunction ((EFI_ACPI_DESCRIPTION_HEADER *)AcpiTable); Valid = CheckAcpiTableFunction ((EFI_ACPI_DESCRIPTION_HEADER *)AcpiTable);
} else { } else {
Valid = TRUE; Valid = TRUE;
@ -141,15 +150,10 @@ LocateAndInstallAcpiFromFvConditional (
// Free memory allocated by ReadSection // Free memory allocated by ReadSection
gBS->FreePool (AcpiTable); gBS->FreePool (AcpiTable);
if (EFI_ERROR (Status)) {
break;
}
// Increment the section instance // Increment the section instance
SectionInstance++; SectionInstance++;
} }
} }
}
FREE_HANDLE_BUFFER: FREE_HANDLE_BUFFER:
// //
@ -157,7 +161,7 @@ FREE_HANDLE_BUFFER:
// //
gBS->FreePool (HandleBuffer); gBS->FreePool (HandleBuffer);
return EFI_SUCCESS; return (FoundAcpiFile ? EFI_SUCCESS : EFI_NOT_FOUND);
} }
/** /**