erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib: Refactor bmp_load_logo() implementation

Browse source 
This refactoring ensures bmp_load_logo() takes logo_size as an
argument, returning a valid logo_ptr only if logo_size is non-zero.

This prevents potential errors from mismatched size assumption.

BUG=b:242829490
TEST=google/rex0 builds successfully.

Change-Id: I14bc54670a67980ec93bc366b274832d1f959e50
Signed-off-by: Subrata Banik <subratabanik@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81618
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Dinesh Gehlot <digehlot@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Subrata Banik 2024-04-02 08:00:14 +00:00
commit 9c4d85d83a
8 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/drivers/intel/fsp1_1/ramstage.c
View file

@ -76,9 +76,11 @@ static void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header)
load_vbt(&silicon_init_params);
mainboard_silicon_init_params(&silicon_init_params);
if (CONFIG(BMP_LOGO))
bmp_load_logo(&silicon_init_params.PcdLogoPtr,
&silicon_init_params.PcdLogoSize);
if (CONFIG(BMP_LOGO)) {
size_t logo_size;
silicon_init_params.PcdLogoPtr = (uint32_t)(uintptr_t)bmp_load_logo(&logo_size);
silicon_init_params.PcdLogoSize = (uint32_t)logo_size;
}
/* Display the UPD data */
if (CONFIG(DISPLAY_UPD_DATA))

6
src/drivers/intel/fsp2_0/fsp_gop_blt.c
View file

@ -237,13 +237,15 @@ void fsp_convert_bmp_to_gop_blt(uint32_t *logo, uint32_t *logo_size,
uint32_t *blt_ptr, uint32_t *blt_size,
uint32_t *pixel_height, uint32_t *pixel_width)
{
uint32_t logo_ptr, logo_ptr_size, blt_buffer_size;
uint32_t logo_ptr;
size_t logo_ptr_size, blt_buffer_size;
efi_bmp_image_header *bmp_header;
if (!logo || !logo_size || !blt_ptr || !blt_size || !pixel_height || !pixel_width)
return;
bmp_load_logo(&logo_ptr, &logo_ptr_size);
logo_ptr = (uint32_t)(uintptr_t)bmp_load_logo(&logo_ptr_size);
if (!logo_ptr || logo_ptr_size < sizeof(efi_bmp_image_header)) {
printk(BIOS_ERR, "%s: BMP Image size is too small.\n", __func__);
return;