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

commonlib/fsp_relocate: Fix potential NULL pointer dereference 

Commit 1df1cf994a ("commonlib/fsp_relocate: add PE32 section
support") introduced a potential NULL pointer dereference if there is
PE32 binary to relocate outside of the first firmware volume.

The `fih_offset' pointer was used as an output variable but now it is
also used as an input variable to pass the FSP information header to
the `pe_relocate()' function.

This commit resolves this potential NULL-pointer dereference by
passing the pointer systematically and without affecting the logic as
it is only set if it has not been set before.

Change-Id: I9fad90a60854d5f050aa044a5c0b3af91c99df4a
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78501
Reviewed-by: Bora Guvendik <bora.guvendik@intel.com>
Reviewed-by: Eric Lai <ericllai@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jeremy Compostella 2023-10-24 10:09:54 -07:00 committed by Matt DeVillier
parent 47b393a17d
commit eb93808fa5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/commonlib/fsp_relocate.c
View File

@ -584,7 +584,7 @@ static ssize_t relocate_fvh(uintptr_t new_addr, void *fsp, size_t fsp_size,
printk(FSP_DBG_LVL, "file offset: %zx\n", file_offset);
/* First file and section should be FSP info header. */
if (fih_offset != NULL && *fih_offset == 0)
if (*fih_offset == 0)
*fih_offset = file_offset;
ffsfh = relative_offset(fsp, file_offset);
@ -671,14 +671,8 @@ ssize_t fsp_component_relocate(uintptr_t new_addr, void *fsp, size_t size)
while (offset < size) {
ssize_t nparsed;
/* Relocate each FV within the FSP region. The FSP_INFO_HEADER
* should only be located in the first FV. */
if (offset == 0)
nparsed = relocate_fvh(new_addr, fsp, size, offset,
&fih_offset);
else
nparsed = relocate_fvh(new_addr, fsp, size, offset,
NULL);
/* Relocate each FV within the FSP region. */
nparsed = relocate_fvh(new_addr, fsp, size, offset, &fih_offset);
/* FV should be larger than 0 or failed to parse. */
if (nparsed <= 0) {