* [gentoo-commits] gentoo commit in src/patchsets/glibc/2.13: 0061_all_glibc-2.13-static-memset.patch README.history
@ 2011-02-22 18:54 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2011-02-22 18:54 UTC (permalink / raw
To: gentoo-commits
vapier 11/02/22 18:54:53
Modified: README.history
Added: 0061_all_glibc-2.13-static-memset.patch
Log:
fix missing memset_chk for static hardened #353816
Revision Changes Path
1.4 src/patchsets/glibc/2.13/README.history
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?r1=1.3&r2=1.4
Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.13/README.history,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.history 14 Feb 2011 17:20:13 -0000 1.3
+++ README.history 22 Feb 2011 18:54:53 -0000 1.4
@@ -1,3 +1,6 @@
+3 [pending]
+ + 0061_all_glibc-2.13-static-memset.patch
+
2 14.02.2011
+ 0050_all_glibc-2.13-ldso-prelink-segv.patch
+ 0060_all_glibc-2.13-static-memmove-ssse3.patch
1.1 src/patchsets/glibc/2.13/0061_all_glibc-2.13-static-memset.patch
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
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
Index: 0061_all_glibc-2.13-static-memset.patch
===================================================================
http://bugs.gentoo.org/353816
From 87fac357a6243982ce21cb71e21bbe0d35234eed Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 22 Feb 2011 13:26:19 -0500
Subject: [PATCH] memset: fix define usage for shared libs
The proper define to check "am I in a shared lib" is "SHARED", not "PIC".
The two new memset_chk functions incorrectly depend on "PIC".
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2011-02-22 Mike Frysinger <vapier@gentoo.org>
* sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED.
* sysdeps/x86_64/memset_chk.S: Likewise.
---
sysdeps/i386/i686/memset_chk.S | 2 +-
sysdeps/x86_64/memset_chk.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sysdeps/i386/i686/memset_chk.S b/sysdeps/i386/i686/memset_chk.S
index cd93d5e..e7511a0 100644
--- a/sysdeps/i386/i686/memset_chk.S
+++ b/sysdeps/i386/i686/memset_chk.S
@@ -20,7 +20,7 @@
#include <sysdep.h>
#include "asm-syntax.h"
-#ifndef PIC
+#ifndef SHARED
/* For libc.so this is defined in memset.S.
For libc.a, this is a separate source to avoid
memset bringing in __chk_fail and all routines
diff --git a/sysdeps/x86_64/memset_chk.S b/sysdeps/x86_64/memset_chk.S
index c1c8c23..2c4fffc 100644
--- a/sysdeps/x86_64/memset_chk.S
+++ b/sysdeps/x86_64/memset_chk.S
@@ -20,7 +20,7 @@
#include <sysdep.h>
#include "asm-syntax.h"
-#ifndef PIC
+#ifndef SHARED
/* For libc.so this is defined in memset.S.
For libc.a, this is a separate source to avoid
memset bringing in __chk_fail and all routines
--
1.7.4.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-22 18:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 18:54 [gentoo-commits] gentoo commit in src/patchsets/glibc/2.13: 0061_all_glibc-2.13-static-memset.patch README.history Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox