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

EmbeddedPkg: do not ASSERT() on valid external input 

Since ASSERT()s are enabled even on all ArmPlatformPkg RELEASE
builds, ASSERT()ing on a valid FDT header will crash the firmware
if the user selects an incorrect file. Since ASSERT() is meant to
catch internal inconsistencies in the firmware, its use here is
inappropriate.

Instead, handle it as a normal error condition.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17309 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ard Biesheuvel 2015-05-05 15:51:44 +00:00 committed by oliviermartin
parent 5a44a766b5
commit e1455b0412
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
View File

@ -94,15 +94,16 @@ InstallFdt (
goto Error; goto Error;
} }
// Check the FDT header is valid. We only make this check in DEBUG mode in
// case the FDT header change on production device and this ASSERT() becomes
// not valid.
ASSERT (fdt_check_header ((VOID*)(UINTN)FdtBlobBase) == 0);
// //
// Ensure the Size of the Device Tree is smaller than the size of the read file // Ensure that the FDT header is valid and that the Size of the Device Tree
// is smaller than the size of the read file
// //
ASSERT ((UINTN)fdt_totalsize ((VOID*)(UINTN)FdtBlobBase) <= FdtBlobSize); if (fdt_check_header ((VOID*)(UINTN)FdtBlobBase) != 0 ||
(UINTN)fdt_totalsize ((VOID*)(UINTN)FdtBlobBase) > FdtBlobSize) {
DEBUG ((EFI_D_ERROR, "InstallFdt() - loaded FDT binary image seems corrupt\n"));
Status = EFI_LOAD_ERROR;
goto Error;
}
// //
// Store the FDT as Runtime Service Data to prevent the Kernel from // Store the FDT as Runtime Service Data to prevent the Kernel from