packages: glibc/glibc.spec, glibc/glibc-bug-12492.patch (NEW) - fix for mpr...

[arekm]

Author: arekm                        Date: Fri Mar 25 18:16:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for mprotect enforced kernel

---- Files affected:
packages/glibc:
   glibc.spec (1.897 -> 1.898) , glibc-bug-12492.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.897 packages/glibc/glibc.spec:1.898
--- packages/glibc/glibc.spec:1.897	Fri Mar 25 18:40:51 2011
+++ packages/glibc/glibc.spec	Fri Mar 25 19:16:09 2011
@@ -80,6 +80,7 @@
 Patch31:	%{name}-origin.patch
 Patch32:	%{name}-Os-fail-workaround.patch
 Patch33:	%{name}-2.13-static-memmove-ssse3.patch
+Patch34:	%{name}-bug-12492.patch
 URL:		http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -929,6 +930,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p0
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -1708,6 +1710,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.898  2011/03/25 18:16:09  arekm
+- fix for mprotect enforced kernel
+
 Revision 1.897  2011/03/25 17:40:51  qboosh
 - typo
 

================================================================
Index: packages/glibc/glibc-bug-12492.patch
diff -u /dev/null packages/glibc/glibc-bug-12492.patch:1.1
--- /dev/null	Fri Mar 25 19:16:14 2011
+++ packages/glibc/glibc-bug-12492.patch	Fri Mar 25 19:16:09 2011
@@ -0,0 +1,15 @@
+--- elf/dl-load.c	2011-01-26 22:02:02.000000000 +0100
++++ elf/dl-load.c	2011-01-26 22:30:22.000000000 +0100
+@@ -1398,7 +1398,11 @@ 
+ 	  if (__builtin_expect (p + s <= relro_end, 1))
+ 	    {
+ 	      /* The variable lies in the region protected by RELRO.  */
+-	      __mprotect ((void *) p, s, PROT_READ|PROT_WRITE);
++	      if (__mprotect ((void *) p, s, PROT_READ|PROT_WRITE) < 0)
++		{
++		  errstring = N_("cannot change memory protections");
++		  goto call_lose_errno;
++		}
+ 	      __stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC;
+ 	      __mprotect ((void *) p, s, PROT_READ);
+ 	    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.897&r2=1.898&f=u