From: Jürg Billeter <j@bitron.ch>
Date: Sat, 29 Jun 2013 09:41:32 +0000 (+0200)
Subject: linux-user: Do not ignore mmap failure from host
X-Git-Tag: v1.6.0-rc0~139^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8384274eda1d7cb01f326143fa6118562c1eb5be;p=thirdparty%2Fqemu.git

linux-user: Do not ignore mmap failure from host

File mapping may fail with EACCES.

Signed-off-by: Jürg Billeter <j@bitron.ch>
Message-id: 1372498892-23676-1-git-send-email-j@bitron.ch
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index b412e3fe0ae..de2219768dc 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -483,6 +483,10 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
         if (!(flags & MAP_ANONYMOUS)) {
             p = mmap(g2h(start), len, prot,
                      flags | MAP_FIXED, fd, host_offset);
+            if (p == MAP_FAILED) {
+                munmap(g2h(start), host_len);
+                goto fail;
+            }
             host_start += offset - host_offset;
         }
         start = h2g(host_start);