diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-11-14 12:13:29 -0800 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-11-29 15:35:38 +0300 |
| commit | 983a4a828c64dba88386f3835d7e24528edbd29e (patch) | |
| tree | a391a8438d4fcd77183b2140780f7d02b3ec15d9 | |
| parent | 88e79a2dfda319f9ebec2cc8a5c3c9733716d13f (diff) | |
linux-user: Fix loaddr computation for some elf files
The file offset of the load segment is not relevant to the
low address, only the beginning of the virtual address page.
Cc: qemu-stable@nongnu.org
Fixes: a93934fecd4 ("elf: take phdr offset into account when calculating the program load address")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1952
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 82d70a84c8ee42ef969a9cfddc0f5b30b16165f5)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | linux-user/elfload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 47170fe5d3..b1462842b6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3093,7 +3093,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 a = eppnt->p_vaddr - eppnt->p_offset; + abi_ulong a = eppnt->p_vaddr & TARGET_PAGE_MASK; if (a < loaddr) { loaddr = a; } |