548bcb
commit ad78d702757a189b1fa552d607e8aaa22252a45f
548bcb
Author: Florian Weimer <fweimer@redhat.com>
548bcb
Date:   Tue May 12 19:06:18 2020 +0200
548bcb
548bcb
    elf: Remove redundant add_to_global_resize_failure  call from dl_open_args
548bcb
    
548bcb
    The second call does not do anything because the data structures have
548bcb
    already been resized by the call that comes before the demarcation
548bcb
    point.  Fixes commit a509eb117fac1d764b15eba64993f4bdb63d7f3c
548bcb
    ("Avoid late dlopen failure due to scope, TLS slotinfo updates
548bcb
    [BZ #25112]").
548bcb
    
548bcb
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
548bcb
548bcb
diff --git a/elf/dl-open.c b/elf/dl-open.c
548bcb
index 3d49a84596e99bf6..b052bb0bc2cd17aa 100644
548bcb
--- a/elf/dl-open.c
548bcb
+++ b/elf/dl-open.c
548bcb
@@ -769,11 +769,6 @@ dl_open_worker (void *a)
548bcb
   DL_STATIC_INIT (new);
548bcb
 #endif
548bcb
 
548bcb
-  /* Perform the necessary allocations for adding new global objects
548bcb
-     to the global scope below, via add_to_global_update.  */
548bcb
-  if (mode & RTLD_GLOBAL)
548bcb
-    add_to_global_resize (new);
548bcb
-
548bcb
   /* Run the initializer functions of new objects.  Temporarily
548bcb
      disable the exception handler, so that lazy binding failures are
548bcb
      fatal.  */