diff mbox

[PULL,3/3] elf: take phdr offset into account when calculating the program load address

Message ID a93934fecd4dffc9d4b452b670c9506be5dea30d.1415015510.git.riku.voipio@linaro.org
State Accepted
Commit a93934fecd4dffc9d4b452b670c9506be5dea30d
Headers show

Commit Message

Riku Voipio Nov. 3, 2014, 12:02 p.m. UTC 
From: Jonas Maebe <jonas.maebe@elis.ugent.be>

The first program header does not necessarily start at offset 0. This change
corresponds to what the Linux kernel does in load_elf_binary().

Signed-off-by: Jonas Maebe <jonas.maebe@elis.ugent.be>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/elfload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index f2e2197..84123ba 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1820,7 +1820,7 @@  static void load_elf_image(const char *image_name, int image_fd,
     loaddr = -1, hiaddr = 0;
     for (i = 0; i < ehdr->e_phnum; ++i) {
         if (phdr[i].p_type == PT_LOAD) {
-            abi_ulong a = phdr[i].p_vaddr;
+            abi_ulong a = phdr[i].p_vaddr - phdr[i].p_offset;
             if (a < loaddr) {
                 loaddr = a;
             }