From: Juergen Lock <nox@jelal.kn-bremen.de>
Date: Thu, 25 Mar 2010 21:11:17 +0000 (+0100)
Subject: Fix bsd-user qemu_vmalloc() host page protection code
X-Git-Tag: v0.13.0-rc0~916
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b035ffd11813524d7c0e44354f5c4bdd281f4b37;p=thirdparty%2Fqemu.git

Fix bsd-user qemu_vmalloc() host page protection code

Just do the same as linux-user does.

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 139cd3f4422..207c774fb05 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -77,16 +77,15 @@ void mmap_unlock(void)
 void *qemu_vmalloc(size_t size)
 {
     void *p;
-    unsigned long addr;
     mmap_lock();
     /* Use map and mark the pages as used.  */
     p = mmap(NULL, size, PROT_READ | PROT_WRITE,
              MAP_PRIVATE | MAP_ANON, -1, 0);
 
-    addr = (unsigned long)p;
-    if (addr == (target_ulong) addr) {
+    if (h2g_valid(p)) {
         /* Allocated region overlaps guest address space.
            This may recurse.  */
+        abi_ulong addr = h2g(p);
         page_set_flags(addr & TARGET_PAGE_MASK, TARGET_PAGE_ALIGN(addr + size),
                        PAGE_RESERVED);
     }