Patchwork linux-user: Do not ignore mmap failure from host

login
register
mail settings
Submitter Jürg Billeter
Date June 29, 2013, 9:41 a.m.
Message ID <1372498892-23676-1-git-send-email-j@bitron.ch>
Download mbox | patch
Permalink /patch/255739/
State New
Headers show

Comments

Jürg Billeter - June 29, 2013, 9:41 a.m.
File mapping may fail with EACCES.

Signed-off-by: Jürg Billeter <j@bitron.ch>
---
 linux-user/mmap.c | 4 ++++
 1 file changed, 4 insertions(+)
Peter Maydell - July 2, 2013, 2:19 p.m.
On 29 June 2013 10:41, Jürg Billeter <j@bitron.ch> wrote:
> File mapping may fail with EACCES.
>
> Signed-off-by: Jürg Billeter <j@bitron.ch>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

Patch

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index b412e3f..de22197 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);