about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-02-20 07:24:56 -0500
committerUlrich Drepper <drepper@gmail.com>2011-02-20 07:24:56 -0500
commite23fe25b33324a9ea992276c1a4f04127bf9ba4b (patch)
tree2d0f3a7a35bd071783c697ebea34fc345c328200 /elf
parentd3f02e1012be2d47c3592212c3117a84bfb1fd86 (diff)
downloadglibc-e23fe25b33324a9ea992276c1a4f04127bf9ba4b.tar.gz
glibc-e23fe25b33324a9ea992276c1a4f04127bf9ba4b.tar.xz
glibc-e23fe25b33324a9ea992276c1a4f04127bf9ba4b.zip
Move setting variable in relro data earlier in ld.so.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 851038089c..174954bf3b 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,5 +1,5 @@
 /* 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.
 
    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.  */
   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)
@@ -2298,9 +2302,8 @@ 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);
+  /* Make sure no new search directories have been added.  */
+  assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
 
   if (! prelinked && rtld_multiple_ref)
     {