michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext: use provided size for more generic code

Browse source 
Use .sh_entsize instead of sizeof(elf_rel_t) to make code suitable
for both REL and RELA types.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2023-09-22 15:35:49 +02:00 • committed by Fabio Baltieri
commit 6058512b06
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/llext/llext.c
View file

@ -464,7 +464,7 @@ static int llext_link(struct llext_loader *ldr, struct llext *ext)
continue; continue;
} }
rel_cnt = shdr.sh_size / sizeof(elf_rel_t); rel_cnt = shdr.sh_size / shdr.sh_entsize;
name = llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB, shdr.sh_name); name = llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB, shdr.sh_name);
@ -484,12 +484,12 @@ static int llext_link(struct llext_loader *ldr, struct llext *ext)
for (int j = 0; j < rel_cnt; j++) { for (int j = 0; j < rel_cnt; j++) {
/* get each relocation entry */ /* get each relocation entry */
ret = llext_seek(ldr, shdr.sh_offset + j * sizeof(elf_rel_t)); ret = llext_seek(ldr, shdr.sh_offset + j * shdr.sh_entsize);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
ret = llext_read(ldr, &rel, sizeof(elf_rel_t)); ret = llext_read(ldr, &rel, shdr.sh_entsize);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }