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

util/cbfstool: Make sure to only compare PT_LOAD segments

Browse source 
When parsing XIP stages only compare PT_LOAD phdrs. Currently coreboot
stages only use PT_LOAD phdrs.

Change-Id: I305b25032a3c4a9fdefc76cad77fafdb862a604c
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84140
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Arthur Heymans 2024-08-30 09:54:36 +02:00 • committed by Felix Held
commit 4e92938fd1
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
util/cbfstool/cbfs-mkstage.c
View file

@ -295,10 +295,10 @@ static int rmod_filter(struct reloc_filter *f, const Elf64_Rela *r)
static Elf64_Phdr **find_loadable_segments(struct parsed_elf *pelf)
{
Elf64_Phdr **phdrs = NULL;
Elf64_Phdr *prev = NULL, *cur;
Elf64_Phdr *prev = NULL, *cur = NULL;
size_t size = 1, i;
for (i = 0; i < pelf->ehdr.e_phnum; i++, prev = cur) {
for (i = 0; i < pelf->ehdr.e_phnum; i++) {
cur = &pelf->phdr[i];
if (cur->p_type != PT_LOAD || cur->p_memsz == 0)
@ -311,16 +311,14 @@ static Elf64_Phdr **find_loadable_segments(struct parsed_elf *pelf)
}
phdrs[size - 2] = cur;
if (!prev)
continue;
if (prev->p_paddr + prev->p_memsz != cur->p_paddr ||
prev->p_filesz != prev->p_memsz) {
if (prev && (prev->p_paddr + prev->p_memsz != cur->p_paddr ||
prev->p_filesz != prev->p_memsz)) {
ERROR("Loadable segments physical addresses should "
"be consecutive\n");
free(phdrs);
return NULL;
}
prev = cur;
}
if (phdrs)