[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/14] linux-user: Use zero_bss for PT_LOAD with no file contents
From: |
Richard Henderson |
Subject: |
[PULL 09/14] linux-user: Use zero_bss for PT_LOAD with no file contents too |
Date: |
Tue, 8 Aug 2023 14:08:51 -0700 |
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>
---
linux-user/elfload.c | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 881fdeb157..e72497c4b4 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3208,7 +3208,7 @@ static void load_elf_image(const char *image_name, int
image_fd,
for (i = 0; i < ehdr->e_phnum; i++) {
struct elf_phdr *eppnt = phdr + i;
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;
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.
*/
if (eppnt->p_filesz != 0) {
- vaddr_len = eppnt->p_filesz + vaddr_po;
- error = target_mmap(vaddr_ps, vaddr_len, elf_prot,
- MAP_PRIVATE | MAP_FIXED,
+ error = target_mmap(vaddr_ps, eppnt->p_filesz + vaddr_po,
+ elf_prot, MAP_PRIVATE | MAP_FIXED,
image_fd, eppnt->p_offset - vaddr_po);
-
if (error == -1) {
goto exit_mmap;
}
+ }
- /*
- * If the load segment requests extra zeros (e.g. bss), map it.
- */
- if (eppnt->p_filesz < eppnt->p_memsz &&
- !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;
- }
+ /* 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)) {
+ goto exit_mmap;
}
/* Find the full program boundaries. */
--
2.34.1
- [PULL 00/14] linux-user image mapping fixes, Richard Henderson, 2023/08/08
- [PULL 01/14] linux-user: Adjust task_unmapped_base for reserved_va, Richard Henderson, 2023/08/08
- [PULL 02/14] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h, Richard Henderson, 2023/08/08
- [PULL 04/14] linux-user: Use MAP_FIXED_NOREPLACE for initial image mmap, Richard Henderson, 2023/08/08
- [PULL 03/14] linux-user: Define ELF_ET_DYN_BASE in $guest/target_mman.h, Richard Henderson, 2023/08/08
- [PULL 05/14] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter, Richard Henderson, 2023/08/08
- [PULL 06/14] linux-user: Adjust initial brk when interpreter is close to executable, Richard Henderson, 2023/08/08
- [PULL 07/14] linux-user: Do not adjust image mapping for host page size, Richard Henderson, 2023/08/08
- [PULL 08/14] linux-user: Do not adjust zero_bss for host page size, Richard Henderson, 2023/08/08
- [PULL 09/14] linux-user: Use zero_bss for PT_LOAD with no file contents too,
Richard Henderson <=
- [PULL 10/14] util/selfmap: Rewrite using qemu/interval-tree.h, Richard Henderson, 2023/08/08
- [PULL 11/14] linux-user: Remove duplicate CPU_LOG_PAGE from probe_guest_base, Richard Henderson, 2023/08/08
- [PULL 12/14] linux-user: Consolidate guest bounds check in probe_guest_base, Richard Henderson, 2023/08/08
- [PULL 13/14] linux-user: Rewrite fixed probe_guest_base, Richard Henderson, 2023/08/08
- [PULL 14/14] linux-user: Rewrite non-fixed probe_guest_base, Richard Henderson, 2023/08/08
- Re: [PULL 00/14] linux-user image mapping fixes, Richard Henderson, 2023/08/08
- Re: [PULL 00/14] linux-user image mapping fixes, Michael Tokarev, 2023/08/15