mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Use zero_bss for PT_LOAD with no file contents too

Browse Source 
If p_filesz == 0, then vaddr_ef == vaddr.  We can reuse the
code in zero_bss rather than incompletely duplicating it in
load_elf_image.

Tested-by: Helge Deller <deller@gmx.de>
Reviewed-by: Helge Deller <deller@gmx.de>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-08-03 20:52:44 +00:00
parent 2d385be615
commit 5f4e5b3409
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
linux-user/elfload.c
View File

@ -3208,7 +3208,7 @@ static void load_elf_image(const char *image_name, int image_fd,
for (i = 0; i < ehdr->e_phnum; i++) { for (i = 0; i < ehdr->e_phnum; i++) {
struct elf_phdr *eppnt = phdr + i; struct elf_phdr *eppnt = phdr + i;
if (eppnt->p_type == PT_LOAD) { if (eppnt->p_type == PT_LOAD) {
abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em, vaddr_len; abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em;
int elf_prot = 0; int elf_prot = 0;
if (eppnt->p_flags & PF_R) { if (eppnt->p_flags & PF_R) {
@ -3233,31 +3233,18 @@ static void load_elf_image(const char *image_name, int image_fd,
* but no backing file segment. * but no backing file segment.
*/ */
if (eppnt->p_filesz != 0) { if (eppnt->p_filesz != 0) {
vaddr_len = eppnt->p_filesz + vaddr_po; error = target_mmap(vaddr_ps, eppnt->p_filesz + vaddr_po,
error = target_mmap(vaddr_ps, vaddr_len, elf_prot, elf_prot, MAP_PRIVATE | MAP_FIXED,
MAP_PRIVATE | MAP_FIXED,
image_fd, eppnt->p_offset - vaddr_po); image_fd, eppnt->p_offset - vaddr_po);
if (error == -1) { if (error == -1) {
goto exit_mmap; goto exit_mmap;
} }
}
/* /* If the load segment requests extra zeros (e.g. bss), map it. */
* If the load segment requests extra zeros (e.g. bss), map it. if (vaddr_ef < vaddr_em &&
*/ !zero_bss(vaddr_ef, vaddr_em, elf_prot)) {
if (eppnt->p_filesz < eppnt->p_memsz && goto exit_mmap;
!zero_bss(vaddr_ef, vaddr_em, elf_prot)) {
goto exit_mmap;
}
} else if (eppnt->p_memsz != 0) {
vaddr_len = eppnt->p_memsz + vaddr_po;
error = target_mmap(vaddr_ps, vaddr_len, elf_prot,
MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS,
-1, 0);
if (error == -1) {
goto exit_mmap;
}
} }
/* Find the full program boundaries. */ /* Find the full program boundaries. */