SOURCES (AC-branch): glibc-pax_dl-execstack.patch - updated for 2.3.6

[kosmo]

Author: kosmo                        Date: Sat Dec 10 10:51:34 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- updated for 2.3.6

---- Files affected:
SOURCES:
   glibc-pax_dl-execstack.patch (1.1.4.2 -> 1.1.4.3) 

---- Diffs:

================================================================
Index: SOURCES/glibc-pax_dl-execstack.patch
diff -u SOURCES/glibc-pax_dl-execstack.patch:1.1.4.2 SOURCES/glibc-pax_dl-execstack.patch:1.1.4.3
--- SOURCES/glibc-pax_dl-execstack.patch:1.1.4.2	Fri Sep 23 14:59:33 2005
+++ SOURCES/glibc-pax_dl-execstack.patch	Sat Dec 10 11:51:29 2005
@@ -1,39 +1,29 @@
-diff -urN glibc-2.3.5.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.3.5/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.3.5.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2005-09-23 13:07:35.000000000 +0200
-+++ glibc-2.3.5/sysdeps/unix/sysv/linux/dl-execstack.c	2005-09-23 13:31:45.000000000 +0200
-@@ -60,7 +60,10 @@
+diff -urN glibc-2.3.6.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.3.6/sysdeps/unix/sysv/linux/dl-execstack.c
+--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2005-07-18 06:11:19.000000000 +0200
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/dl-execstack.c	2005-12-10 10:14:37.000000000 +0100
+@@ -62,6 +62,7 @@
  	no_growsupdown = true;
        else
  # endif
--	return errno;
-+	if (errno == EACCES) /* PaX */
-+	    return 0;
-+	else
-+	    return errno;
-     }
- #endif
- 
-@@ -86,7 +89,10 @@
++      if (errno != EACCES)	/* PaX */
  	{
- 	  /* Unexpected failure mode.  */
- 	  if (errno != ENOMEM && errno != EFAULT)
--	    return errno;
-+	    if (errno == EACCES) /* PaX */
-+		return 0;
-+	    else
-+	    	return errno;
- 
- 	  if (size == GLRO(dl_pagesize))
- 	    /* We just tried to mprotect the top hole page and failed.
-@@ -110,7 +116,10 @@
+ 	  result = errno;
+ 	  goto out;
+@@ -89,7 +90,7 @@
+ 	page -= size;
+       else
+ 	{
+-	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
++	  if (errno != ENOMEM && errno != EACCES)	/* Unexpected failure mode.  */	/* PaX */
+ 	    {
+ 	      result = errno;
+ 	      goto out;
+@@ -115,7 +116,7 @@
+ 	page += size;
+       else
  	{
- 	  /* Unexpected failure mode.  */
- 	  if (errno != ENOMEM && errno != EFAULT)
--	    return errno;
-+	    if (errno == EACCES) /* PaX */
-+		return 0;
-+	    else
-+	    	return errno;
- 
- 	  if (size == GLRO(dl_pagesize))
- 	    /* We just tried to mprotect the lowest hole page and failed.
+-	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
++	  if (errno != ENOMEM && errno != EACCES)	/* Unexpected failure mode.  */	/* PaX */
+ 	    {
+ 	      result = errno;
+ 	      goto out;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/glibc-pax_dl-execstack.patch?r1=1.1.4.2&r2=1.1.4.3&f=u