Fix mmap flags: MAP_32BIT is x86_64 only, and MAP_FIXED is inappropri…

…ate for this application
dyninst · Jun 8, 2016 · 0a31e58 · 0a31e58
1 parent a1dae47
commit 0a31e58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dyninstAPI_RT/src/RTheap-linux.c b/dyninstAPI_RT/src/RTheap-linux.c
@@ -60,7 +60,7 @@ Address DYNINSTheap_loAddr = 0x50000000;
 Address DYNINSTheap_hiAddr = 0xb0000000;
 #endif
 
-int     DYNINSTheap_mmapFlags = MAP_ANONYMOUS | MAP_FIXED | MAP_PRIVATE;
+int     DYNINSTheap_mmapFlags = MAP_ANONYMOUS | MAP_PRIVATE;
 
 
 RT_Boolean DYNINSTheap_useMalloc(void *lo, void *hi)

diff --git a/dyninstAPI_RT/src/RTposix.c b/dyninstAPI_RT/src/RTposix.c
@@ -250,10 +250,11 @@ int DYNINSTwriteEvent(void *ev, size_t sz)
 void *map_region(void *addr, int len, int fd) {
      void *result;
     int flags = DYNINSTheap_mmapFlags;
+#if defined(arch_x86_64)
     if(addr == 0) flags |= MAP_32BIT;
+#endif
      result = mmap(addr, len, PROT_READ|PROT_WRITE|PROT_EXEC,
                    flags, fd, 0);
-                   flags, fd, 0);
      if (result == MAP_FAILED)
          return NULL;
      return result;