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:a93934fecd
("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 commit82d70a84c8
) Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
3c0463a650
commit
e79947a57f
@ -3001,7 +3001,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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user