diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-02 15:41:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-02 15:41:38 +0000 |
| commit | 30a9fd5d13b0a4290382adc4c1bf619677066b89 (patch) | |
| tree | 7327dbaa1da19f0e397dfef405a45755ff61a92c /linux-user/elfload.c | |
| parent | 9d7b969ea6d9663a94760c6c131481b366f4d38a (diff) | |
| parent | 0c2d70c448b7853a91cfa63659aa3cc6630fb9be (diff) | |
| download | focaccia-qemu-30a9fd5d13b0a4290382adc4c1bf619677066b89.tar.gz focaccia-qemu-30a9fd5d13b0a4290382adc4c1bf619677066b89.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* exec.c use after free * Xen 32-on-64 breakage * missing EINTR * naughty warning under qtest # gpg: Signature made Wed 02 Dec 2015 12:13:55 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" * remotes/bonzini/tags/for-upstream: translate-all: ensure host page mask is always extended with 1's main-loop: suppress warnings under qtest qemu-char: retry g_poll on EINTR exec: Stop using memory after free Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/elfload.c')
| -rw-r--r-- | linux-user/elfload.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index d68f5a16ca..8b17c0e94b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1478,8 +1478,7 @@ static void zero_bss(abi_ulong elf_bss, abi_ulong last_bss, int prot) host_start = (uintptr_t) g2h(elf_bss); host_end = (uintptr_t) g2h(last_bss); - host_map_start = (host_start + qemu_real_host_page_size - 1); - host_map_start &= -qemu_real_host_page_size; + host_map_start = REAL_HOST_PAGE_ALIGN(host_start); if (host_map_start < host_end) { void *p = mmap((void *)host_map_start, host_end - host_map_start, |