about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-05-12 19:06:18 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-05-12 19:06:18 +0200
commitad78d702757a189b1fa552d607e8aaa22252a45f (patch)
tree302df1b320fe8db77cf09b9f8405de8263a9a1fe
parenteec0f4218cda936a6ab8f543e90b96b196df3fc2 (diff)
downloadglibc-ad78d702757a189b1fa552d607e8aaa22252a45f.tar.gz
glibc-ad78d702757a189b1fa552d607e8aaa22252a45f.tar.xz
glibc-ad78d702757a189b1fa552d607e8aaa22252a45f.zip
elf: Remove redundant add_to_global_resize_failure call from dl_open_args
The second call does not do anything because the data structures have
already been resized by the call that comes before the demarcation
point.  Fixes commit a509eb117fac1d764b15eba64993f4bdb63d7f3c
("Avoid late dlopen failure due to scope, TLS slotinfo updates
[BZ #25112]").

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-rw-r--r--elf/dl-open.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c
index ddcb8b53fc..8769e47051 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -769,11 +769,6 @@ dl_open_worker (void *a)
   DL_STATIC_INIT (new);
 #endif
 
-  /* Perform the necessary allocations for adding new global objects
-     to the global scope below, via add_to_global_update.  */
-  if (mode & RTLD_GLOBAL)
-    add_to_global_resize (new);
-
   /* Run the initializer functions of new objects.  Temporarily
      disable the exception handler, so that lazy binding failures are
      fatal.  */