about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/Versions1
-rw-r--r--elf/dl-deps.c100
-rw-r--r--elf/dl-object.c1
-rw-r--r--elf/dl-open.c70
-rw-r--r--elf/ldsodefs.h7
-rw-r--r--elf/rtld.c6
6 files changed, 109 insertions, 76 deletions
diff --git a/elf/Versions b/elf/Versions
index 5e10adf1fb..c8bea74545 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -20,6 +20,7 @@ libc {
     # global variables
     _dl_profile; _dl_profile_map; _dl_profile_output; _dl_start_profile;
     _dl_loaded; _dl_main_searchlist; _dl_fpu_control; _dl_initial_searchlist;
+    _dl_global_scope_alloc;
 
     # functions used in other libraries
     _dl_mcount; _dl_mcount_wrapper; _dl_mcount_wrapper_check; _dl_unload_cache;
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index f08f652642..04c4010b65 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -34,6 +34,11 @@
 #define FILTERTAG (DT_NUM + DT_PROCNUM + DT_VERSIONTAGNUM \
 		   + DT_EXTRATAGIDX (DT_FILTER))
 
+/* This is zero at program start to signal that the global scope map is
+   allocated by rtld.  Later it keeps the size of the map.  It might be
+   reset if in _dl_close if the last global object is removed.  */
+size_t _dl_global_scope_alloc;
+
 
 /* When loading auxiliary objects we must ignore errors.  It's ok if
    an object is missing.  */
@@ -79,11 +84,11 @@ struct list
   };
 
 
-void
+unsigned int
 internal_function
 _dl_map_object_deps (struct link_map *map,
 		     struct link_map **preloads, unsigned int npreloads,
-		     int trace_mode)
+		     int trace_mode, int global_scope)
 {
   struct list known[1 + npreloads + 1];
   struct list *runp, *utail, *dtail;
@@ -158,7 +163,7 @@ _dl_map_object_deps (struct link_map *map,
 	  orig = runp;
 
 	  for (d = l->l_ld; d->d_tag != DT_NULL; ++d)
-	    if (d->d_tag == DT_NEEDED)
+	    if (__builtin_expect (d->d_tag, DT_NEEDED) == DT_NEEDED)
 	      {
 		/* Map in the needed object.  */
 		struct link_map *dep
@@ -392,13 +397,98 @@ _dl_map_object_deps (struct link_map *map,
     map->l_searchlist.r_duplist = map->l_searchlist.r_list;
   else
     {
+      unsigned int cnt;
+
       map->l_searchlist.r_duplist = malloc (nduplist
 					    * sizeof (struct link_map *));
       if (map->l_searchlist.r_duplist == NULL)
 	_dl_signal_error (ENOMEM, map->l_name,
 			  "cannot allocate symbol search list");
 
-      for (nlist = 0, runp = known; runp; runp = runp->dup)
-	map->l_searchlist.r_duplist[nlist++] = runp->map;
+      for (cnt = 0, runp = known; runp; runp = runp->dup)
+	map->l_searchlist.r_duplist[cnt++] = runp->map;
     }
+
+  /* Now that all this succeeded put the objects in the global scope if
+     this is necessary.  We put the original object and all the dependencies
+     in the global scope.  If an object is already loaded and not in the
+     global scope we promote it.  */
+  if (global_scope)
+    {
+      unsigned int cnt;
+      unsigned int to_add = 0;
+      struct link_map **new_global;
+
+      /* Count the objects we have to put in the global scope.  */
+      for (cnt = 0; cnt < nlist; ++cnt)
+	if (map->l_searchlist.r_list[cnt]->l_global == 0)
+	  ++to_add;
+
+      /* The symbols of the new objects and its dependencies are to be
+	 introduced into the global scope that will be used to resolve
+	 references from other dynamically-loaded objects.
+
+	 The global scope is the searchlist in the main link map.  We
+	 extend this list if necessary.  There is one problem though:
+	 since this structure was allocated very early (before the libc
+	 is loaded) the memory it uses is allocated by the malloc()-stub
+	 in the ld.so.  When we come here these functions are not used
+	 anymore.  Instead the malloc() implementation of the libc is
+	 used.  But this means the block from the main map cannot be used
+	 in an realloc() call.  Therefore we allocate a completely new
+	 array the first time we have to add something to the locale scope.  */
+
+      if (_dl_global_scope_alloc == 0)
+	{
+	  /* This is the first dynamic object given global scope.  */
+	  _dl_global_scope_alloc = _dl_main_searchlist->r_nlist + to_add + 8;
+	  new_global = (struct link_map **)
+	    malloc (_dl_global_scope_alloc * sizeof (struct link_map *));
+	  if (new_global == NULL)
+	    {
+	      _dl_global_scope_alloc = 0;
+	    nomem:
+	      _dl_signal_error (ENOMEM, map->l_libname->name,
+				"cannot extend global scope");
+	      return 0;
+	    }
+
+	  /* Copy over the old entries.  */
+	  memcpy (new_global, _dl_main_searchlist->r_list,
+		  (_dl_main_searchlist->r_nlist * sizeof (struct link_map *)));
+
+	  _dl_main_searchlist->r_list = new_global;
+	}
+      else if (_dl_main_searchlist->r_nlist + to_add > _dl_global_scope_alloc)
+	{
+	  /* We have to extend the existing array of link maps in the
+	     main map.  */
+	  new_global = (struct link_map **)
+	    realloc (_dl_main_searchlist->r_list,
+		     ((_dl_global_scope_alloc + to_add + 8)
+		      * sizeof (struct link_map *)));
+	  if (new_global == NULL)
+	    goto nomem;
+
+	  _dl_global_scope_alloc += to_add + 8;
+	  _dl_main_searchlist->r_list = new_global;
+	}
+
+      /* Now add the new entries.  */
+      to_add = 0;
+      for (cnt = 0; cnt < nlist; ++cnt)
+	if (map->l_searchlist.r_list[cnt]->l_global == 0)
+	  {
+	    map->l_searchlist.r_list[cnt]->l_global = 1;
+	    _dl_main_searchlist->r_list[_dl_main_searchlist->r_nlist + to_add]
+	      = map->l_searchlist.r_list[cnt];
+	    ++to_add;
+	  }
+
+      /* XXX Do we have to add something to r_dupsearchlist???  --drepper */
+
+      return to_add;
+    }
+
+  return 0;
 }
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 297f30ecee..ec05abd423 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -48,6 +48,7 @@ _dl_new_object (char *realname, const char *libname, int type,
   new->l_libname = newname;
   new->l_type = type;
   new->l_loader = loader;
+  new->l_global = 0;
 
   /* Counter for the scopes we have to handle.  */
   idx = 0;
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 83e6424c84..9bbbee80f7 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -42,11 +42,6 @@ extern char **__libc_argv;
 
 extern char **__environ;
 
-/* This is zero at program start to signal that the global scope map is
-   allocated by rtld.  Later it keeps the size of the map.  It might be
-   reset if in _dl_close if the last global object is removed.  */
-size_t _dl_global_scope_alloc;
-
 
 /* During the program run we must not modify the global data of
    loaded shared object simultanously in two threads.  Therefore we
@@ -77,6 +72,7 @@ dl_open_worker (void *a)
   struct link_map *new, *l;
   ElfW(Addr) init;
   struct r_debug *r;
+  unsigned int global_add;
 
   /* Load the named object.  */
   args->map = new = _dl_map_object (NULL, file, 0, lt_loaded, 0);
@@ -85,7 +81,7 @@ dl_open_worker (void *a)
     return;
 
   /* Load that object's dependencies.  */
-  _dl_map_object_deps (new, NULL, 0, 0);
+  global_add = _dl_map_object_deps (new, NULL, 0, 0, mode & RTLD_GLOBAL);
 
   /* So far, so good.  Now check the versions.  */
   (void) _dl_check_all_versions (new, 0);
@@ -127,66 +123,6 @@ dl_open_worker (void *a)
       l = l->l_prev;
     }
 
-  new->l_global = (mode & RTLD_GLOBAL) ? 1 : 0;
-  if (new->l_global)
-    {
-      struct link_map **new_global;
-
-      /* The symbols of the new object and its dependencies are to be
-	 introduced into the global scope that will be used to resolve
-	 references from other dynamically-loaded objects.
-
-	 The global scope is the searchlist in the main link map.  We
-	 extend this list if necessary.  There is one problem though:
-	 since this structure was allocated very early (before the libc
-	 is loaded) the memory it uses is allocated by the malloc()-stub
-	 in the ld.so.  When we come here these functions are not used
-	 anymore.  Instead the malloc() implementation of the libc is
-	 used.  But this means the block from the main map cannot be used
-	 in an realloc() call.  Therefore we allocate a completely new
-	 array the first time we have to add something to the locale scope.  */
-      if (_dl_global_scope_alloc == 0)
-	{
-	  /* This is the first dynamic object given global scope.  */
-	  _dl_global_scope_alloc = _dl_main_searchlist->r_nlist + 8;
-	  new_global = (struct link_map **)
-	    malloc (_dl_global_scope_alloc * sizeof (struct link_map *));
-	  if (new_global == NULL)
-	    {
-	      _dl_global_scope_alloc = 0;
-	    nomem:
-	      new->l_global = 0;
-	      _dl_signal_error (ENOMEM, file, "cannot extend global scope");
-	    }
-
-	  /* Copy over the old entries.  */
-	  memcpy (new_global, _dl_main_searchlist->r_list,
-		  (_dl_main_searchlist->r_nlist * sizeof (struct link_map *)));
-
-	  _dl_main_searchlist->r_list = new_global;
-	}
-      else if (_dl_main_searchlist->r_nlist == _dl_global_scope_alloc)
-	{
-	  /* We have to extend the existing array of link maps in the
-	     main map.  */
-	  new_global = (struct link_map **)
-	    realloc (_dl_main_searchlist->r_list,
-		     ((_dl_global_scope_alloc + 8)
-		      * sizeof (struct link_map *)));
-	  if (new_global == NULL)
-	    goto nomem;
-
-	  _dl_global_scope_alloc += 8;
-	  _dl_main_searchlist->r_list = new_global;
-	}
-
-      /* Now add the new entry.  */
-      _dl_main_searchlist->r_list[_dl_main_searchlist->r_nlist] = new;
-
-      /* XXX Do we have to add something to r_dupsearchlist???  --drepper */
-    }
-
-
   /* Notify the debugger we have added some objects.  We need to call
      _dl_debug_initialize in a static program in case dynamic linking has
      not been used before.  */
@@ -201,7 +137,7 @@ dl_open_worker (void *a)
 
   if (new->l_global)
     /* Now we can make the new map available in the global scope.  */
-    ++_dl_main_searchlist->r_nlist;
+    _dl_main_searchlist->r_nlist += global_add;
 
   if (_dl_sysdep_start == NULL)
     /* We must be the static _dl_open in libc.a.  A static program that
diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h
index 7d0bdda980..97ab955386 100644
--- a/elf/ldsodefs.h
+++ b/elf/ldsodefs.h
@@ -249,9 +249,10 @@ extern struct link_map *_dl_map_object (struct link_map *loader,
    MAP->l_searchlist.  PRELOADS points to a vector of NPRELOADS previously
    loaded objects that will be inserted into MAP->l_searchlist after MAP
    but before its dependencies.  */
-extern void _dl_map_object_deps (struct link_map *map,
-				 struct link_map **preloads,
-				 unsigned int npreloads, int trace_mode)
+extern unsigned int _dl_map_object_deps (struct link_map *map,
+					 struct link_map **preloads,
+					 unsigned int npreloads,
+					 int trace_mode, int global_scope)
      internal_function;
 
 /* Cache the locations of MAP's hash table.  */
diff --git a/elf/rtld.c b/elf/rtld.c
index 8d3a9c47a1..472cb21127 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -667,7 +667,11 @@ of this helper program; chances are you did not intend to run this program.\n\
   /* Load all the libraries specified by DT_NEEDED entries.  If LD_PRELOAD
      specified some libraries to load, these are inserted before the actual
      dependencies in the executable's searchlist for symbol resolution.  */
-  _dl_map_object_deps (_dl_loaded, preloads, npreloads, mode == trace);
+  _dl_map_object_deps (_dl_loaded, preloads, npreloads, mode == trace, 0);
+
+  /* Mark all objects as being in the global scope.  */
+  for (i = _dl_loaded->l_searchlist.r_nlist; i > 0; )
+    _dl_loaded->l_searchlist.r_list[--i]->l_global = 1;
 
 #ifndef MAP_ANON
   /* We are done mapping things, so close the zero-fill descriptor.  */