From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id B96003870847; Tue, 12 May 2020 17:22:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B96003870847 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] elf: Remove redundant add_to_global_resize_failure call from dl_open_args X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: eec0f4218cda936a6ab8f543e90b96b196df3fc2 X-Git-Newrev: ad78d702757a189b1fa552d607e8aaa22252a45f Message-Id: <20200512172206.B96003870847@sourceware.org> Date: Tue, 12 May 2020 17:22:06 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2020 17:22:06 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ad78d702757a189b1fa552d607e8aaa22252a45f commit ad78d702757a189b1fa552d607e8aaa22252a45f Author: Florian Weimer Date: Tue May 12 19:06:18 2020 +0200 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 Diff: --- elf/dl-open.c | 5 ----- 1 file changed, 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. */