r5764 - in glibc-package/trunk/debian: . patches patches/any
Author: adconrad
Date: 2013-11-10 11:19:10 +0000 (Sun, 10 Nov 2013)
New Revision: 5764
Added:
glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4788-static-ptrguard-arm.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/cvs-CVE-2013-4788-static-ptrguard-arm.diff: Pull fix
from git to Fix the static-ptrguard testsuite regression on ARM.
* patches/series: Re-enable CVE-2013-4788 fixed (Closes: #717178)
* patches/any/cvs-CVE-2012-44xx.diff: Include <sys/param.h> to get
MIN/MAX macros on hurd-i386.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-11-10 09:47:31 UTC (rev 5763)
+++ glibc-package/trunk/debian/changelog 2013-11-10 11:19:10 UTC (rev 5764)
@@ -2,9 +2,14 @@
!!! PLEASE MOVE FEATURE DEVELOPMENT TO 2.18 OR UPSTREAM !!!
+ [ Adam Conrad ]
+ * patches/any/cvs-CVE-2013-4788-static-ptrguard-arm.diff: Pull fix
+ from git to Fix the static-ptrguard testsuite regression on ARM.
+ * patches/series: Re-enable CVE-2013-4788 fixed (Closes: #717178)
+
[ Samuel Thibault ]
- * patches/any/cvs-CVE-2012-44xx.diff: Include <sys/param.h> to get MIN/MAX
- macros.
+ * patches/any/cvs-CVE-2012-44xx.diff: Include <sys/param.h> to get
+ MIN/MAX macros on hurd-i386.
-- Adam Conrad <adconrad@0c3.net> Sat, 09 Nov 2013 21:45:05 -0700
Added: glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4788-static-ptrguard-arm.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4788-static-ptrguard-arm.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-CVE-2013-4788-static-ptrguard-arm.diff 2013-11-10 11:19:10 UTC (rev 5764)
@@ -0,0 +1,47 @@
+commit 0b1f8e35640f5b3f7af11764ade3ff060211c309
+Author: Carlos O'Donell <carlos@redhat.com>
+Date: Mon Sep 23 01:44:38 2013 -0400
+
+ BZ #15754: Fix test case for ARM.
+
+ Statically built binaries use __pointer_chk_guard_local,
+ while dynamically built binaries use __pointer_chk_guard.
+ Provide the right definition depending on the test case
+ we are building.
+
+
+ [BZ #15754]
+ * sysdeps/generic/stackguard-macros.h: If PTRGUARD_LOCAL use
+ __pointer_chk_guard_local, otherwise __pointer_chk_guard.
+ * elf/Makefile: Define CFLAGS-tst-ptrguard1-static.c.
+
+diff --git a/elf/Makefile b/elf/Makefile
+index cb8da93..27d249b 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1019,6 +1019,9 @@ tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
+ tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+
+ tst-ptrguard1-ARGS = --command "$(host-built-program-cmd) --child"
++# When built statically, the pointer guard interface uses
++# __pointer_chk_guard_local.
++CFLAGS-tst-ptrguard1-static.c = -DPTRGUARD_LOCAL
+ tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
+
+ $(objpfx)tst-leaks1: $(libdl)
+diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
+index 4fa3d96..b4a6b23 100644
+--- a/sysdeps/generic/stackguard-macros.h
++++ b/sysdeps/generic/stackguard-macros.h
+@@ -3,5 +3,10 @@
+ extern uintptr_t __stack_chk_guard;
+ #define STACK_CHK_GUARD __stack_chk_guard
+
++#ifdef PTRGUARD_LOCAL
+ extern uintptr_t __pointer_chk_guard_local;
+-#define POINTER_CHK_GUARD __pointer_chk_guard_local
++# define POINTER_CHK_GUARD __pointer_chk_guard_local
++#else
++extern uintptr_t __pointer_chk_guard;
++# define POINTER_CHK_GUARD __pointer_chk_guard
++#endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-11-10 09:47:31 UTC (rev 5763)
+++ glibc-package/trunk/debian/patches/series 2013-11-10 11:19:10 UTC (rev 5764)
@@ -264,6 +264,7 @@
any/cvs-CVE-2012-44xx.diff
any/cvs-CVE-2013-4237.diff
#any/cvs-CVE-2013-2207-pt_chown.diff
-#any/cvs-CVE-2013-4788-static-ptrguard.diff
-#any/cvs-CVE-2013-4788-static-ptrguard-ppc64.diff
+any/cvs-CVE-2013-4788-static-ptrguard.diff
+any/cvs-CVE-2013-4788-static-ptrguard-ppc64.diff
+any/cvs-CVE-2013-4788-static-ptrguard-arm.diff
any/unsubmitted-dlopen-static-crash.diff
Reply to: