This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.12.90-6-130-ge0b020a
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Sep 2010 14:59:11 -0000
- Subject: GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.12.90-6-130-ge0b020a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, fedora/master has been updated
via e0b020a2cca97de36105ca0611f426aeaef5f6a0 (commit)
via 25b3aadaf646bff18d6527e03717c87bf50b3a50 (commit)
from d17673a914adcb0b8d536ec5b18080bde0a7051a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e0b020a2cca97de36105ca0611f426aeaef5f6a0
commit e0b020a2cca97de36105ca0611f426aeaef5f6a0
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Sep 28 15:17:01 2010 +0200
2.12.90-14
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index ce79fb8..7ff1970 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -20,7 +20,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 13
+Release: 14
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1022,6 +1022,10 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Sep 28 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-14
+- Don't try to write to _rtld_global_ro after performing relro
+ protection (#638091)
+
* Mon Sep 27 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-13
- Update from master
- Add two forgotten licence exceptions
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=25b3aadaf646bff18d6527e03717c87bf50b3a50
commit 25b3aadaf646bff18d6527e03717c87bf50b3a50
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Sep 28 15:11:48 2010 +0200
Don't try to write to _rtld_global_ro after performing relro protection
diff --git a/ChangeLog b/ChangeLog
index 3351f49..44886cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-28 Andreas Schwab <schwab@redhat.com>
+
+ * elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
+ before performing relro protection.
+
2010-09-27 Andreas Schwab <schwab@redhat.com>
* include/link.h (struct link_map): Add l_free_initfini.
diff --git a/elf/rtld.c b/elf/rtld.c
index 9a560b3..201c9cf 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
we need it in the memory handling later. */
GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+ /* Remember the last search directory added at startup, now that
+ malloc will no longer be the one from dl-minimal.c. */
+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+
if (prelinked)
{
if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
lossage);
}
- /* Remember the last search directory added at startup, now that
- malloc will no longer be the one from dl-minimal.c. */
- GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
-
if (! prelinked && rtld_multiple_ref)
{
/* There was an explicit ref to the dynamic linker as a shared lib.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
elf/rtld.c | 8 ++++----
fedora/glibc.spec.in | 6 +++++-
3 files changed, 14 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources