Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

process/load: fix loading on NOMMU #621

Merged
merged 1 commit into from
Nov 8, 2024
Merged

process/load: fix loading on NOMMU #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 4 additions & 37 deletions proc/process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,9 +744,6 @@ int process_load(process_t *process, vm_object_t *o, off_t base, size_t size, vo
Elf32_Phdr *phdr;
Elf32_Shdr *shdr, *shstrshdr;
Elf32_Rela rela;
int isrela;
Elf32_Addr symval;
Elf32_Sym *symTab = NULL;
unsigned prot, flags, reloffs;
int i, j, relocsz = 0, badreloc = 0, err;
void *relptr;
Expand Down Expand Up @@ -875,28 +872,14 @@ int process_load(process_t *process, vm_object_t *o, off_t base, size_t size, vo
return -ENOEXEC;
}

/* find symtab */
for (i = 0, shdr = (void *)((char *)ehdr + ehdr->e_shoff); i < ehdr->e_shnum; i++, shdr++) {
if (hal_strcmp(&snameTab[shdr->sh_name], ".symtab") == 0) {
symTab = (void *)((ptr_t)ehdr + (ptr_t)shdr->sh_offset);
break;
}
}

/* Perform data, init_array and fini_array relocation */
for (i = 0, shdr = (void *)((char *)ehdr + ehdr->e_shoff); i < ehdr->e_shnum; i++, shdr++) {
if ((shdr->sh_size == 0) || (shdr->sh_entsize == 0)) {
continue;
}

/* strncmp as there may be multiple .rela.* or .rel.* sections for different sections. */
if (hal_strncmp(&snameTab[shdr->sh_name], ".rela.", 6) == 0) {
isrela = 1;
}
else if (hal_strncmp(&snameTab[shdr->sh_name], ".rel.", 5) == 0) {
isrela = 0;
}
else {
/* strncmp as there may be multiple .rela.* or .rel.* sections for different sections. */
if ((hal_strncmp(&snameTab[shdr->sh_name], ".rela.", 6) != 0) && (hal_strncmp(&snameTab[shdr->sh_name], ".rel.", 5) != 0)) {
continue;
}

Expand All @@ -920,24 +903,8 @@ int process_load(process_t *process, vm_object_t *o, off_t base, size_t size, vo
continue;
}

if (symTab == NULL) {
/* Accept files stripped from symtab if only SYM_UND is present, eg. files stripped with strip.py */
if (ELF32_R_SYM(rela.r_info) != 0) {
return -ENOEXEC;
}
symval = 0;
}
else {
symval = symTab[ELF32_R_SYM(rela.r_info)].st_value;
}

if (isrela == 0) {
/* If Rel is used addend is stored in the location. */
*(char **)relptr += symval;
}
else {
*(char **)relptr = (char *)(symval + rela.r_addend);
}
/* NOTE: Build process on NOMMU compiles a position-dependend binary but kernel treats it as a PIE. */
/* There is no need to look at the symbol and perform calculations as it is already done by static linker. */

if (process_relocate(reloc, relocsz, relptr) < 0) {
return -ENOEXEC;
Expand Down
Loading