[pushed] Move _dl_open_check to its original place in dl_open_worker

Message ID 20191127203050.0659620AF6@gnutoolchain-gerrit.osci.io
State New
Headers show
  • [pushed] Move _dl_open_check to its original place in dl_open_worker
Related show

Commit Message

Simon Marchi (Code Review) Nov. 27, 2019, 8:30 p.m.
Sourceware to Gerrit sync has submitted this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/473

Move _dl_open_check to its original place in dl_open_worker

This reverts the non-test change from commit d0093c5cefb7f7a4143f
("Call _dl_open_check after relocation [BZ #24259]"), given that
the underlying bug has been fixed properly in commit 61b74477fa7f63
("Remove all loaded objects if dlopen fails, ignoring NODELETE
[BZ #20839]").

Tested on x86-64-linux-gnu, with and without --enable-cet.

Change-Id: I995a6cfb89f25d2b0cf5e606428c2a93eb48fc33
M elf/dl-open.c
1 file changed, 2 insertions(+), 6 deletions(-)

  Carlos O'Donell: Looks good to me, approved

Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I995a6cfb89f25d2b0cf5e606428c2a93eb48fc33
Gerrit-Change-Number: 473
Gerrit-PatchSet: 6
Gerrit-Owner: Florian Weimer <fweimer@redhat.com>
Gerrit-Reviewer: Carlos O'Donell <carlos@redhat.com>
Gerrit-Reviewer: Florian Weimer <fweimer@redhat.com>
Gerrit-MessageType: merged


diff --git a/elf/dl-open.c b/elf/dl-open.c
index 1051e22..df9f29a 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -622,6 +622,8 @@ 
   _dl_debug_state ();
   LIBC_PROBE (map_complete, 3, args->nsid, r, new);
+  _dl_open_check (new);
   /* Print scope information.  */
   if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES))
     _dl_show_scope (new, 0);
@@ -702,12 +704,6 @@ 
 	_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
-  /* NB: Workaround for [BZ #20839] which doesn't remove the NODELETE
-     object when _dl_open_check throws an exception.  Move it after
-     relocation to avoid leaving the NODELETE object mapped without
-     relocation.  */
-  _dl_open_check (new);
   /* This only performs the memory allocations.  The actual update of
      the scopes happens below, after failure is impossible.  */
   resize_scopes (new);