From: amateur <tianlei.zhao@gmail.com>
Date: Tue, 14 Sep 2010 05:22:34 +0000 (+0800)
Subject: linux-user: mmap_reserve() not controlled by RESERVED_VA
X-Git-Tag: v0.14.0-rc0~400^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c65ffe6d6ca8b156e729e81054ca7597864354a9;p=thirdparty%2Fqemu.git

linux-user: mmap_reserve() not controlled by RESERVED_VA

mmap_reserve() should be called only when RESERVED_VA is enabled.
Otherwise, unmaped virtual address space will never be reusable. This
bug will exhaust virtual address space in extreme conditions.

Signed-off-by: Riku Voipio <riku.voipio@nokia.com>
---

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 035dfbd076a..abf21f60649 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -697,7 +697,9 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
                                          old_size, new_size,
                                          flags | MREMAP_FIXED,
                                          g2h(mmap_start));
-            mmap_reserve(old_addr, old_size);
+            if ( RESERVED_VA ) {
+                mmap_reserve(old_addr, old_size);
+            }
         }
     } else {
         int prot = 0;