linux-user: Fix loaddr computation for some elf files

[PATCH for-8.2] linux-user: Fix loaddr computation for some elf files

Richard Henderson posted 1 patch 1 year ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231114201742.183271-1-richard.henderson@linaro.org

Maintainers: Laurent Vivier <laurent@vivier.eu>

linux-user/elfload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH for-8.2] linux-user: Fix loaddr computation for some elf files

Posted by Richard Henderson 1 year ago

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>
---
 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 4cd6891d7b..cf9e74468b 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3308,7 +3308,7 @@ static void load_elf_image(const char *image_name, const ImageSource *src,
     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.34.1

Re: [PATCH for-8.2] linux-user: Fix loaddr computation for some elf files

Posted by Michael Tokarev 1 year ago

14.11.2023 23:17, Richard Henderson:
> 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>

> ---
>   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 4cd6891d7b..cf9e74468b 100644
> --- a/linux-user/elfload.c
> +++ b/linux-user/elfload.c
> @@ -3308,7 +3308,7 @@ static void load_elf_image(const char *image_name, const ImageSource *src,
>       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;
>               }