| 1 |
vapier 11/05/28 18:56:10 |
| 2 |
|
| 3 |
Modified: 0050_all_glibc-2.13-ldso-prelink-segv.patch |
| 4 |
README.history |
| 5 |
Log: |
| 6 |
grab updated ldso prelink fix from upstream |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 src/patchsets/glibc/2.13/0050_all_glibc-2.13-ldso-prelink-segv.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/0050_all_glibc-2.13-ldso-prelink-segv.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/0050_all_glibc-2.13-ldso-prelink-segv.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/0050_all_glibc-2.13-ldso-prelink-segv.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: 0050_all_glibc-2.13-ldso-prelink-segv.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.13/0050_all_glibc-2.13-ldso-prelink-segv.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 0050_all_glibc-2.13-ldso-prelink-segv.patch 14 Feb 2011 17:20:13 -0000 1.1 |
| 22 |
+++ 0050_all_glibc-2.13-ldso-prelink-segv.patch 28 May 2011 18:56:10 -0000 1.2 |
| 23 |
@@ -1,26 +1,31 @@ |
| 24 |
http://bugs.gentoo.org/353814 |
| 25 |
http://sources.redhat.com/bugzilla/show_bug.cgi?id=12489 |
| 26 |
|
| 27 |
-From 25b3aadaf646bff18d6527e03717c87bf50b3a50 Mon Sep 17 00:00:00 2001 |
| 28 |
+From 996cf2ef07277805f119c8b47be92334c907ce8f Mon Sep 17 00:00:00 2001 |
| 29 |
From: Andreas Schwab <schwab@××××××.com> |
| 30 |
-Date: Tue, 28 Sep 2010 15:11:48 +0200 |
| 31 |
-Subject: [PATCH] Don't try to write to _rtld_global_ro after performing relro protection |
| 32 |
+Date: Sun, 20 Feb 2011 07:24:56 -0500 |
| 33 |
+Subject: [PATCH] Move setting variable in relro data earlier in ld.so. |
| 34 |
|
| 35 |
+(cherry picked from commit e23fe25b33324a9ea992276c1a4f04127bf9ba4b) |
| 36 |
--- |
| 37 |
- ChangeLog | 5 +++++ |
| 38 |
- elf/rtld.c | 8 ++++---- |
| 39 |
- 2 files changed, 9 insertions(+), 4 deletions(-) |
| 40 |
+ ChangeLog | 8 ++++++++ |
| 41 |
+ NEWS | 2 +- |
| 42 |
+ elf/rtld.c | 11 +++++++---- |
| 43 |
+ 3 files changed, 16 insertions(+), 5 deletions(-) |
| 44 |
|
| 45 |
2010-09-28 Andreas Schwab <schwab@××××××.com> |
| 46 |
+ Ulrich Drepper <drepper@×××××.com> |
| 47 |
|
| 48 |
+ [BZ #12489] |
| 49 |
* elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs) |
| 50 |
- before performing relro protection. |
| 51 |
+ before performing relro protection. At old place add assertion |
| 52 |
+ to make sure nothing changed. |
| 53 |
|
| 54 |
diff --git a/elf/rtld.c b/elf/rtld.c |
| 55 |
-index 9a560b3..201c9cf 100644 |
| 56 |
+index 8510380..174954b 100644 |
| 57 |
--- a/elf/rtld.c |
| 58 |
+++ b/elf/rtld.c |
| 59 |
-@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 60 |
+@@ -2179,6 +2179,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 61 |
we need it in the memory handling later. */ |
| 62 |
GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; |
| 63 |
|
| 64 |
@@ -31,17 +36,18 @@ |
| 65 |
if (prelinked) |
| 66 |
{ |
| 67 |
if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) |
| 68 |
-@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 69 |
+@@ -2298,9 +2302,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", |
| 70 |
lossage); |
| 71 |
} |
| 72 |
|
| 73 |
- /* Remember the last search directory added at startup, now that |
| 74 |
- malloc will no longer be the one from dl-minimal.c. */ |
| 75 |
- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); |
| 76 |
-- |
| 77 |
++ /* Make sure no new search directories have been added. */ |
| 78 |
++ assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs)); |
| 79 |
+ |
| 80 |
if (! prelinked && rtld_multiple_ref) |
| 81 |
{ |
| 82 |
- /* There was an explicit ref to the dynamic linker as a shared lib. |
| 83 |
-- |
| 84 |
-1.7.4.rc2 |
| 85 |
+1.7.5.rc3 |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.20 src/patchsets/glibc/2.13/README.history |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?rev=1.20&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?rev=1.20&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.13/README.history?r1=1.19&r2=1.20 |
| 95 |
|
| 96 |
Index: README.history |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.13/README.history,v |
| 99 |
retrieving revision 1.19 |
| 100 |
retrieving revision 1.20 |
| 101 |
diff -u -r1.19 -r1.20 |
| 102 |
--- README.history 28 May 2011 18:44:57 -0000 1.19 |
| 103 |
+++ README.history 28 May 2011 18:56:10 -0000 1.20 |
| 104 |
@@ -1,5 +1,6 @@ |
| 105 |
7 [pending] |
| 106 |
+ 0043_all_glibc-2.12-broken-tls-init.patch |
| 107 |
+ U 0050_all_glibc-2.13-ldso-prelink-segv.patch |
| 108 |
|
| 109 |
6 10.04.2011 |
| 110 |
+ 1508_all_glibc-2.13-hppa-DEFAULT_STACK_PERMS.patch |
Archives