GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commonlib: update fsp_relocate to make it compatible with UEFI 2.6 

UEFI 2.6 spec casts the return of FFS_FILE2_SIZE to a UINT32
which cannot be read using read_le32(&returnval). Add in a
cast in order to safeguard for any non x86 architecture that may
use this relocate. The proper change will be to get the UEFI
header files changed to not cast this return value.

Change-Id: Ie1b50d99576ac42a0413204bbd599bab9f01828e
Signed-off-by: Brandon Breitenstein <brandon.breitenstein@intel.com>
Reviewed-on: https://review.coreboot.org/16309
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Brandon Breitenstein 2016-08-23 14:55:13 -07:00 committed by Martin Roth
parent 4bf48e8c33
commit 51a0f7cee4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/commonlib/fsp_relocate.c
View File

@ -258,8 +258,15 @@ static size_t ffs_file_size(const EFI_FFS_FILE_HEADER *ffsfh)
{ {
size_t size; size_t size;
if (IS_FFS_FILE2(ffsfh)) if (IS_FFS_FILE2(ffsfh)) {
size = read_le32(&FFS_FILE2_SIZE(ffsfh)); /*
* this cast is needed with UEFI 2.6 headers in order
* to read the UINT32 value that FFS_FILE2_SIZE converts
* the return into
*/
uint32_t file2_size = FFS_FILE2_SIZE(ffsfh);
size = read_le32(&file2_size);
}
else { else {
size = read_le8(&ffsfh->Size[0]) << 0; size = read_le8(&ffsfh->Size[0]) << 0;
size |= read_le8(&ffsfh->Size[1]) << 8; size |= read_le8(&ffsfh->Size[1]) << 8;