From: Julian Seward <jseward@acm.org>
Date: Mon, 6 Feb 2006 23:22:31 +0000 (+0000)
Subject: This causes problems on setups where ld.so is mapped at just over 1M:
X-Git-Tag: svn/VALGRIND_3_2_0~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2a48e34989d342029a8443a25df68f693da7a60;p=thirdparty%2Fvalgrind.git

This causes problems on setups where ld.so is mapped at just over 1M:
it zeroes out that area (as a result of one of the mmaps) and the
program consequently goes into an infinite loop.  Change the map sizes
to just one page to avoid that.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5616
---

diff --git a/memcheck/tests/zeropage.c b/memcheck/tests/zeropage.c
index a4ba95f247..4302b2fe10 100644
--- a/memcheck/tests/zeropage.c
+++ b/memcheck/tests/zeropage.c
@@ -11,25 +11,25 @@
 int main(void)
 {
    /* mmap(0x0, ... FIXED) should fail */
-   int* m = mmap(0x0, 1000000, PROT_READ|PROT_WRITE, 
+   int* m = mmap(0x0, 4096, PROT_READ|PROT_WRITE, 
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
 
    /* mmap(0x1000, ... FIXED) should fail */
-        m = mmap((void*)0x1000, 1000000, PROT_READ|PROT_WRITE, 
+        m = mmap((void*)0x1000, 4096, PROT_READ|PROT_WRITE, 
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
 
    /* mmap(0xa000, ... FIXED) should fail */
-        m = mmap((void*)0xa000, 1000000, PROT_READ|PROT_WRITE, 
+        m = mmap((void*)0xa000, 4096, PROT_READ|PROT_WRITE, 
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m != (int*)-1)
       printf("succeeded?!\n");
 
    /* mmap(0x10000, ... FIXED) should fail */
-        m = mmap((void*)0x10000, 1000000, PROT_READ|PROT_WRITE, 
+        m = mmap((void*)0x10000, 4096, PROT_READ|PROT_WRITE, 
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m == (int*)-1)
       printf("failed?!\n");