0.9.5.73:

[sbcl.git] / src / runtime / linux-os.c

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index 9bc5ea1..ce900a7 100644 (file)
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -98,16 +98,17 @@ int linux_sparc_siginfo_bug = 0;
 int linux_no_threads_p = 0;
 
 #ifdef LISP_FEATURE_SB_THREAD
-int isnptl (void)
+int
+isnptl (void)
 {
   size_t n = confstr (_CS_GNU_LIBPTHREAD_VERSION, NULL, 0);
-  if (n > 0)
-    {
+  if (n > 0) {
       char *buf = alloca (n);
       confstr (_CS_GNU_LIBPTHREAD_VERSION, buf, n);
-      if (strstr (buf, "NPTL"))
-        return 1;
-    }
+      if (strstr (buf, "NPTL")) {
+          return 1;
+      }
+  }
   return 0;
 }
 #endif
@@ -163,10 +164,21 @@ Please use a more recent kernel or a version of SBCL without threading support.\
     if ((major_version == 2 && minor_version >= 6)
         || major_version >= 3)
     {
-        long pers = personality(-1);
+        int pers = personality(0xffffffffUL);
         /* 0x40000 aka. ADDR_NO_RANDOMIZE */
         if (!(pers & 0x40000)) {
-            if (personality(pers | 0x40000) != -1) {
+            int retval = personality(pers | 0x40000);
+            /* Allegedly some Linux kernels (the reported case was
+             * "hardened Linux 2.6.7") won't set the new personality,
+             * but nor will they return -1 for an error. So as a
+             * workaround query the new personality...
+             */
+            int newpers = personality(0xffffffffUL);
+            /* ... and don't re-execute if either the setting resulted
+             * in an error or if the value didn't change. Otherwise
+             * this might result in an infinite loop.
+             */
+            if (retval != -1 && newpers != pers) {
                 /* Use /proc/self/exe instead of trying to figure out
                  * the executable path from PATH and argv[0], since
                  * that's unreliable. We follow the symlink instead of
@@ -211,11 +223,17 @@ os_validate(os_vm_address_t addr, os_vm_size_t len)
     }
 #endif
     actual = mmap(addr, len, OS_VM_PROT_ALL, flags, -1, 0);
-    if (actual == MAP_FAILED || (addr && (addr!=actual))) {
+    if (actual == MAP_FAILED) {
         perror("mmap");
         return 0;               /* caller should check this */
     }
 
+    if (addr && (addr!=actual)) {
+        fprintf(stderr, "mmap: wanted %lu bytes at %p, actually mapped at %p\n",
+                (unsigned long) len, addr, actual);
+        return 0;
+    }
+
 #ifdef LISP_FEATURE_ALPHA
 
     len=(len+(os_vm_page_size-1))&(~(os_vm_page_size-1));