mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
Move setting variable in relro data earlier in ld.so.
This commit is contained in:
parent
d3f02e1012
commit
e23fe25b33
@ -1,3 +1,11 @@
|
|||||||
|
2010-09-28 Andreas Schwab <schwab@redhat.com>
|
||||||
|
Ulrich Drepper <drepper@gmail.com>
|
||||||
|
|
||||||
|
[BZ #12489]
|
||||||
|
* elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
|
||||||
|
before performing relro protection. At old place add assertion
|
||||||
|
to make sure nothing changed.
|
||||||
|
|
||||||
2011-02-17 Nathan Sidwell <nathan@codesourcery.com>
|
2011-02-17 Nathan Sidwell <nathan@codesourcery.com>
|
||||||
Glauber de Oliveira Costa <glommer@gmail.com>
|
Glauber de Oliveira Costa <glommer@gmail.com>
|
||||||
|
|
||||||
|
2
NEWS
2
NEWS
@ -9,7 +9,7 @@ Version 2.14
|
|||||||
|
|
||||||
* The following bugs are resolved with this release:
|
* The following bugs are resolved with this release:
|
||||||
|
|
||||||
11724, 12460, 12469
|
11724, 12460, 12469, 12489
|
||||||
|
|
||||||
Version 2.13
|
Version 2.13
|
||||||
|
|
||||||
|
11
elf/rtld.c
11
elf/rtld.c
@ -1,5 +1,5 @@
|
|||||||
/* Run time dynamic linker.
|
/* Run time dynamic linker.
|
||||||
Copyright (C) 1995-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
@ -2179,6 +2179,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
|||||||
we need it in the memory handling later. */
|
we need it in the memory handling later. */
|
||||||
GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
|
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 (prelinked)
|
||||||
{
|
{
|
||||||
if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
|
if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
|
||||||
@ -2298,9 +2302,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
|||||||
lossage);
|
lossage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Remember the last search directory added at startup, now that
|
/* Make sure no new search directories have been added. */
|
||||||
malloc will no longer be the one from dl-minimal.c. */
|
assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
|
||||||
GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
|
|
||||||
|
|
||||||
if (! prelinked && rtld_multiple_ref)
|
if (! prelinked && rtld_multiple_ref)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user