2005-02-07 Ulrich Drepper <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/dl-execstack.c: Include sysdep.h.
	(_dl_make_stack_executable): Make sure registers are set correctly.

diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c
index 6ef9679045a3019e152087763b5fe6d9337ef80d..0a5b83b69cea75b18ada91a85a20d77bcfb3a839 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-execstack.c
+++ b/sysdeps/unix/sysv/linux/dl-execstack.c
@@ -24,6 +24,7 @@
 #include <stdbool.h>
 #include <stackinfo.h>
 #include <caller.h>
+#include <sysdep.h>
 
 #include "kernel-features.h"
 
@@ -38,6 +39,7 @@ _dl_make_stack_executable (void **stack_endp)
   /* This gives us the highest/lowest page that needs to be changed.  */
   uintptr_t page = ((uintptr_t) *stack_endp
                    & -(intptr_t) GLRO(dl_pagesize));
+  int result = 0;
 
   /* Challenge the caller.  */
   if (__builtin_expect (__check_caller (RETURN_ADDRESS (0),
@@ -60,7 +62,10 @@ _dl_make_stack_executable (void **stack_endp)
        no_growsupdown = true;
       else
 # endif
-       return errno;
+       {
+         result = errno;
+         goto out;
+       }
     }
 #endif
 
@@ -85,7 +90,10 @@ _dl_make_stack_executable (void **stack_endp)
       else
        {
          if (errno != ENOMEM)  /* Unexpected failure mode.  */
-           return errno;
+           {
+             result = errno;
+             goto out;
+           }
 
          if (size == GLRO(dl_pagesize))
            /* We just tried to mprotect the top hole page and failed.
@@ -108,7 +116,10 @@ _dl_make_stack_executable (void **stack_endp)
       else
        {
          if (errno != ENOMEM)  /* Unexpected failure mode.  */
-           return errno;
+           {
+             result = errno;
+             goto out;
+           }
 
          if (size == GLRO(dl_pagesize))
            /* We just tried to mprotect the lowest hole page and failed.
@@ -133,6 +144,11 @@ _dl_make_stack_executable (void **stack_endp)
   /* Remember that we changed the permission.  */
   GL(dl_stack_flags) |= PF_X;
 
-  return 0;
+ out:
+#ifdef check_consistency
+  check_consistency ();
+#endif
+
+  return result;
 }
 rtld_hidden_def (_dl_make_stack_executable)