From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, "Helge Deller" <deller@gmx.de>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 06/13] linux-user: Adjust brk for load_bias
Date: Fri, 1 Sep 2023 13:42:44 -0700 [thread overview]
Message-ID: <20230901204251.137307-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230901204251.137307-1-richard.henderson@linaro.org>
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
next prev parent reply other threads:[~2023-09-01 20:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 20:42 [PULL 00/13] linux-user patch queue Richard Henderson
2023-09-01 20:42 ` [PULL 01/13] linux-user: Split out cpu/target_proc.h Richard Henderson
2023-09-01 20:42 ` [PULL 02/13] linux-user: Emulate /proc/cpuinfo on aarch64 and arm Richard Henderson
2023-09-01 20:42 ` [PULL 03/13] linux-user: Emulate /proc/cpuinfo for Alpha Richard Henderson
2023-09-01 20:42 ` [PULL 04/13] util/selfmap: Use dev_t and ino_t in MapInfo Richard Henderson
2023-09-01 20:42 ` [PULL 05/13] linux-user: Use walk_memory_regions for open_self_maps Richard Henderson
2024-01-26 13:03 ` Richard Purdie
2024-01-26 13:33 ` Michael Tokarev
2024-01-26 13:52 ` Richard Purdie
2024-02-05 3:05 ` Richard Henderson
2024-02-05 11:11 ` Richard Purdie
2024-02-12 20:43 ` Ilya Leoshkevich
2024-02-22 0:14 ` Richard Henderson
2023-09-01 20:42 ` Richard Henderson [this message]
2023-09-01 20:42 ` [PULL 07/13] linux-user: Show heap address in /proc/pid/maps Richard Henderson
2023-09-01 20:42 ` [PULL 08/13] linux-user: Emulate the Anonymous: keyword in /proc/self/smaps Richard Henderson
2023-09-01 20:42 ` [PULL 09/13] linux-user: Remove ELF_START_MMAP and image_info.start_mmap Richard Henderson
2023-09-01 20:42 ` [PULL 10/13] linux-user: Move shmat and shmdt implementations to mmap.c Richard Henderson
2023-09-01 20:42 ` [PULL 11/13] linux-user: Use WITH_MMAP_LOCK_GUARD in target_{shmat, shmdt} Richard Henderson
2023-09-01 20:42 ` [PULL 12/13] linux-user: Fix shmdt Richard Henderson
2023-09-01 20:42 ` [PULL 13/13] linux-user: Track shm regions with an interval tree Richard Henderson
2023-09-06 18:24 ` [PULL 00/13] linux-user patch queue Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230901204251.137307-7-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=deller@gmx.de \
--cc=iii@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).