[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/13] linux-user: Adjust brk for load_bias
From: |
Richard Henderson |
Subject: |
[PULL 06/13] linux-user: Adjust brk for load_bias |
Date: |
Fri, 1 Sep 2023 13:42:44 -0700 |
PIE executables are usually linked at offset 0 and are
relocated somewhere during load. The hiaddr needs to
be adjusted to keep the brk next to the executable.
Cc: qemu-stable@nongnu.org
Fixes: 1f356e8c013 ("linux-user: Adjust initial brk when interpreter is close
to executable")
Tested-by: Helge Deller <deller@gmx.de>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/elfload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 7c95098e3e..d52d47c5c3 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3327,7 +3327,7 @@ static void load_elf_image(const char *image_name, int
image_fd,
info->start_data = -1;
info->end_data = 0;
/* Usual start for brk is after all sections of the main executable. */
- info->brk = TARGET_PAGE_ALIGN(hiaddr);
+ info->brk = TARGET_PAGE_ALIGN(hiaddr + load_bias);
info->elf_flags = ehdr->e_flags;
prot_exec = PROT_EXEC;
--
2.34.1
- [PULL 00/13] linux-user patch queue, Richard Henderson, 2023/09/01
- [PULL 03/13] linux-user: Emulate /proc/cpuinfo for Alpha, Richard Henderson, 2023/09/01
- [PULL 01/13] linux-user: Split out cpu/target_proc.h, Richard Henderson, 2023/09/01
- [PULL 02/13] linux-user: Emulate /proc/cpuinfo on aarch64 and arm, Richard Henderson, 2023/09/01
- [PULL 06/13] linux-user: Adjust brk for load_bias,
Richard Henderson <=
- [PULL 04/13] util/selfmap: Use dev_t and ino_t in MapInfo, Richard Henderson, 2023/09/01
- [PULL 05/13] linux-user: Use walk_memory_regions for open_self_maps, Richard Henderson, 2023/09/01
- [PULL 08/13] linux-user: Emulate the Anonymous: keyword in /proc/self/smaps, Richard Henderson, 2023/09/01
- [PULL 09/13] linux-user: Remove ELF_START_MMAP and image_info.start_mmap, Richard Henderson, 2023/09/01
- [PULL 07/13] linux-user: Show heap address in /proc/pid/maps, Richard Henderson, 2023/09/01
- [PULL 12/13] linux-user: Fix shmdt, Richard Henderson, 2023/09/01
- [PULL 11/13] linux-user: Use WITH_MMAP_LOCK_GUARD in target_{shmat, shmdt}, Richard Henderson, 2023/09/01
- [PULL 10/13] linux-user: Move shmat and shmdt implementations to mmap.c, Richard Henderson, 2023/09/01
- [PULL 13/13] linux-user: Track shm regions with an interval tree, Richard Henderson, 2023/09/01
- Re: [PULL 00/13] linux-user patch queue, Stefan Hajnoczi, 2023/09/06