From: Richard Henderson <richard.hender...@linaro.org>
The file offset of the load segment is not relevant to the
low address, only the beginning of the virtual address page.
Cc: qemu-sta...@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.hender...@linaro.org>
Reviewed-by: Michael Tokarev <m...@tls.msk.ru>
(cherry picked from commit 82d70a84c8ee42ef969a9cfddc0f5b30b16165f5)
Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
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;
}
--
2.39.2
