adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

LLEXT: no repeated linking with inline relocations

Browse source 
When linking and relocations are performed on the ELF object itself
with no copying, also global binding linking can break references.
Disable linking globally for such cases.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2024-11-11 16:19:08 +01:00 committed by Fabio Baltieri
parent 827909b7b9
commit cbb6199e67
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsys/llext/llext_link.c
View file

@ -259,10 +259,7 @@ static void llext_link_plt(struct llext_loader *ldr, struct llext *ext, elf_shdr
arch_elf_relocate_global(ldr, ext, &rela, &sym, got_offset, link_addr);
break;
case STB_LOCAL:
if (ldr_parm->relocate_local) {
arch_elf_relocate_local(ldr, ext, &rela, &sym, got_offset,
ldr_parm);
}
arch_elf_relocate_local(ldr, ext, &rela, &sym, got_offset, ldr_parm);
}
LOG_DBG("symbol %s offset %#zx r-offset %#zx .text offset %#zx stb %u",

12
subsys/llext/llext_load.c
View file

@ -712,11 +712,13 @@ int do_llext_load(struct llext_loader *ldr, struct llext *ext,
goto out;
}
LOG_DBG("Linking ELF...");
ret = llext_link(ldr, ext, ldr_parm);
if (ret != 0) {
LOG_ERR("Failed to link, ret %d", ret);
goto out;
if (ldr_parm->relocate_local) {
LOG_DBG("Linking ELF...");
ret = llext_link(ldr, ext, ldr_parm);
if (ret != 0) {
LOG_ERR("Failed to link, ret %d", ret);
goto out;
}
}
ret = llext_export_symbols(ldr, ext);