diff options
| author | Tom Musta | 2014-11-06 20:43:13 +0100 |
|---|---|---|
| committer | Riku Voipio | 2014-11-11 07:12:45 +0100 |
| commit | ccf661f827faf700b03a30076b5f944e8f787280 (patch) | |
| tree | 98baaa004b686a0d004c495d74bdb175966def0e /linux-user | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| download | qemu-ccf661f827faf700b03a30076b5f944e8f787280.tar.gz qemu-ccf661f827faf700b03a30076b5f944e8f787280.tar.xz qemu-ccf661f827faf700b03a30076b5f944e8f787280.zip | |
linux-user: Do not subtract offset from end address
When computing the upper address of a program segment, do not subtract the
offset from the virtual address; instead compute the sum of the virtual address
and the memory size.
Signed-off-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
| -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 84123baa58..e2596a4201 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1824,7 +1824,7 @@ static void load_elf_image(const char *image_name, int image_fd, if (a < loaddr) { loaddr = a; } - a += phdr[i].p_memsz; + a = phdr[i].p_vaddr + phdr[i].p_memsz; if (a > hiaddr) { hiaddr = a; } |