bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llext: xtensa: fix RELATIVE relocations

Browse Source 
With dynamically linked / shared ELF objects the displacement
between file offsets and memory addresses can differ between
sections. Therefore we cannot use .text for all such relocations and
have to locate the respective section instead.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2024-12-13 17:34:57 +01:00 committed by Benjamin Cabé
parent 92287c4e8e
commit 00b6ae5bbc
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/xtensa/core/elf.c
View File

@ -42,9 +42,22 @@ static void xtensa_elf_relocate(struct llext_loader *ldr, struct llext *ext,
case R_XTENSA_RELATIVE:
;
/* Relocate a local symbol: Xtensa specific. Seems to only be used with PIC */
uintptr_t text = (uintptr_t)ext->mem[LLEXT_MEM_TEXT];
unsigned int sh_ndx;
*got_entry += text - addr;
for (sh_ndx = 0; sh_ndx < ext->sect_cnt; sh_ndx++) {
if (ext->sect_hdrs[sh_ndx].sh_addr <= *got_entry &&
*got_entry <
ext->sect_hdrs[sh_ndx].sh_addr + ext->sect_hdrs[sh_ndx].sh_size)
break;
}
if (sh_ndx == ext->sect_cnt) {
LOG_ERR("%#x not found in any of the sections", *got_entry);
return;
}
*got_entry += (uintptr_t)llext_loaded_sect_ptr(ldr, ext, sh_ndx) -
ext->sect_hdrs[sh_ndx].sh_addr;
break;
case R_XTENSA_GLOB_DAT:
case R_XTENSA_JMP_SLOT: