| 1 |
vapier 11/02/22 18:54:53 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: 0061_all_glibc-2.13-static-memset.patch |
| 5 |
Log: |
| 6 |
fix missing memset_chk for static hardened #353816 |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 src/patchsets/glibc/2.13/README.history |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: README.history |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.13/README.history,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- README.history 14 Feb 2011 17:20:13 -0000 1.3 |
| 22 |
+++ README.history 22 Feb 2011 18:54:53 -0000 1.4 |
| 23 |
@@ -1,3 +1,6 @@ |
| 24 |
+3 [pending] |
| 25 |
+ + 0061_all_glibc-2.13-static-memset.patch |
| 26 |
+ |
| 27 |
2 14.02.2011 |
| 28 |
+ 0050_all_glibc-2.13-ldso-prelink-segv.patch |
| 29 |
+ 0060_all_glibc-2.13-static-memmove-ssse3.patch |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 src/patchsets/glibc/2.13/0061_all_glibc-2.13-static-memset.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/0061_all_glibc-2.13-static-memset.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/0061_all_glibc-2.13-static-memset.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: 0061_all_glibc-2.13-static-memset.patch |
| 39 |
=================================================================== |
| 40 |
http://bugs.gentoo.org/353816 |
| 41 |
|
| 42 |
From 87fac357a6243982ce21cb71e21bbe0d35234eed Mon Sep 17 00:00:00 2001 |
| 43 |
From: Mike Frysinger <vapier@g.o> |
| 44 |
Date: Tue, 22 Feb 2011 13:26:19 -0500 |
| 45 |
Subject: [PATCH] memset: fix define usage for shared libs |
| 46 |
|
| 47 |
The proper define to check "am I in a shared lib" is "SHARED", not "PIC". |
| 48 |
The two new memset_chk functions incorrectly depend on "PIC". |
| 49 |
|
| 50 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 51 |
|
| 52 |
2011-02-22 Mike Frysinger <vapier@g.o> |
| 53 |
|
| 54 |
* sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED. |
| 55 |
* sysdeps/x86_64/memset_chk.S: Likewise. |
| 56 |
--- |
| 57 |
sysdeps/i386/i686/memset_chk.S | 2 +- |
| 58 |
sysdeps/x86_64/memset_chk.S | 2 +- |
| 59 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 60 |
|
| 61 |
diff --git a/sysdeps/i386/i686/memset_chk.S b/sysdeps/i386/i686/memset_chk.S |
| 62 |
index cd93d5e..e7511a0 100644 |
| 63 |
--- a/sysdeps/i386/i686/memset_chk.S |
| 64 |
+++ b/sysdeps/i386/i686/memset_chk.S |
| 65 |
@@ -20,7 +20,7 @@ |
| 66 |
#include <sysdep.h> |
| 67 |
#include "asm-syntax.h" |
| 68 |
|
| 69 |
-#ifndef PIC |
| 70 |
+#ifndef SHARED |
| 71 |
/* For libc.so this is defined in memset.S. |
| 72 |
For libc.a, this is a separate source to avoid |
| 73 |
memset bringing in __chk_fail and all routines |
| 74 |
diff --git a/sysdeps/x86_64/memset_chk.S b/sysdeps/x86_64/memset_chk.S |
| 75 |
index c1c8c23..2c4fffc 100644 |
| 76 |
--- a/sysdeps/x86_64/memset_chk.S |
| 77 |
+++ b/sysdeps/x86_64/memset_chk.S |
| 78 |
@@ -20,7 +20,7 @@ |
| 79 |
#include <sysdep.h> |
| 80 |
#include "asm-syntax.h" |
| 81 |
|
| 82 |
-#ifndef PIC |
| 83 |
+#ifndef SHARED |
| 84 |
/* For libc.so this is defined in memset.S. |
| 85 |
For libc.a, this is a separate source to avoid |
| 86 |
memset bringing in __chk_fail and all routines |
| 87 |
-- |
| 88 |
1.7.4.1 |
Archives