source: patches/eglibc-2.15-fixes-1.patch@ 52368aa

elf/dl-close.c

@@ -119 +119 @@
   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
       || dl_close_state != not_pending)
     {
-      if (map->l_direct_opencount == 0)
-        {
-          if (map->l_type == lt_loaded)
-            dl_close_state = rerun;
-          else if (map->l_type == lt_library)
-            {
-              struct link_map **oldp = map->l_initfini;
-              map->l_initfini = map->l_orig_initfini;
-              _dl_scope_free (oldp);
-            }
-        }
+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
+        dl_close_state = rerun;
 
       /* There are still references to this object.  Do nothing more.  */
       if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))

elf/dl-deps.c

@@ -489 +489 @@
                   nneeded * sizeof needed[0]);
           atomic_write_barrier ();
           l->l_initfini = l_initfini;
+          l->l_free_initfini = 1;
+
         }
 
       /* If we have no auxiliary objects just go on to the next map.  */
@@ -689 +691 @@
   l_initfini[nlist] = NULL;
   atomic_write_barrier ();
   map->l_initfini = l_initfini;
+  map->l_free_initfini = 1;
   if (l_reldeps != NULL)
     {
       atomic_write_barrier ();
@@ -697 +700 @@
       _dl_scope_free (old_l_reldeps);
     }
   if (old_l_initfini != NULL)
-      map->l_orig_initfini = old_l_initfini;
+    _dl_scope_free (old_l_initfini);
 
   if (errno_reason)
     _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,

elf/dl-libc.c

@@ -284 +284 @@
               if (! old->dont_free)
                 free (old);
             }
+
+          /* Free the initfini dependency list.  */
+          if (l->l_free_initfini)
+            free (l->l_initfini);
         }
 
       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0

elf/rtld.c

@@ -2277 +2277 @@
               lnp->dont_free = 1;
               lnp = lnp->next;
             }
+          l->l_free_initfini = 0;
 
           if (l != &GL(dl_rtld_map))
             _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,

include/link.h

@@ -192 +192 @@
                                                  during LD_TRACE_PRELINKING=1
                                                  contains any DT_SYMBOLIC
                                                  libraries.  */
+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
+                                       freed, ie. not allocated with
+                                       the dummy malloc in ld.so.  */
 
     /* Collected information about own RPATH directories.  */
     struct r_search_path_struct l_rpath_dirs;
@@ -240 +243 @@
 
     /* List of object in order of the init and fini calls.  */
     struct link_map **l_initfini;
-    /* The init and fini list generated at startup, saved when the
-       object is also loaded dynamically.  */
-    struct link_map **l_orig_initfini;
 
     /* List of the dependencies introduced through symbol binding.  */
     struct link_map_reldeps