commit 9f55d2e7c42e6ca862a25d3ee3eb2b367811c30d

Author: Florian Weimer <fweimer@redhat.com>

Date:   Fri Oct 14 12:43:07 2022 +0200

    elf: Do not completely clear reused namespace in dlmopen (bug 29600)

    The data in the _ns_debug member must be preserved, otherwise

    _dl_debug_initialize enters an infinite loop.  To be conservative,

    only clear the libc_map member for now, to fix bug 29528.

    Fixes commit d0e357ff45a75553dee3b17ed7d303bfa544f6fe

    ("elf: Call __libc_early_init for reused namespaces (bug 29528)"),

    by reverting most of it.

    Reviewed-by: Carlos O'Donell <carlos@redhat.com>

    Tested-by: Carlos O'Donell <carlos@redhat.com>

    (cherry picked from commit 2c42257314536b94cc8d52edede86e94e98c1436)

    (Conflict in elf/dl-open.c due to missing _r_debug namespace support.)

diff --git a/elf/dl-open.c b/elf/dl-open.c

index 1ab3c7b5ac2fbc45..633b047ad2497296 100644

--- a/elf/dl-open.c

+++ b/elf/dl-open.c

@@ -839,15 +839,13 @@ _dl_open (const char *file, int mode, const void *caller_dlopen, Lmid_t nsid,

 	  _dl_signal_error (EINVAL, file, NULL, N_("\

 no more namespaces available for dlmopen()"));

 	}

+      else if (nsid == GL(dl_nns))

+	{

+	  __rtld_lock_initialize (GL(dl_ns)[nsid]._ns_unique_sym_table.lock);

+	  ++GL(dl_nns);

+	}

-      if (nsid == GL(dl_nns))

-	++GL(dl_nns);

-

-      /* Initialize the new namespace.  Most members are

-	 zero-initialized, only the lock needs special treatment.  */

-      memset (&GL(dl_ns)[nsid], 0, sizeof (GL(dl_ns)[nsid]));

-      __rtld_lock_initialize (GL(dl_ns)[nsid]._ns_unique_sym_table.lock);

-

+      GL(dl_ns)[nsid].libc_map = NULL;

       _dl_debug_initialize (0, nsid)->r_state = RT_CONSISTENT;

     }

   /* Never allow loading a DSO in a namespace which is empty.  Such

diff --git a/elf/tst-dlmopen-twice.c b/elf/tst-dlmopen-twice.c

index 449f3c8fa9f2aa01..70c71fe19c7d0bf9 100644

--- a/elf/tst-dlmopen-twice.c

+++ b/elf/tst-dlmopen-twice.c

@@ -16,18 +16,38 @@

    License along with the GNU C Library; if not, see

    <https://www.gnu.org/licenses/>.  */

-#include <support/xdlfcn.h>

+#include <stdio.h>

 #include <support/check.h>

+#include <support/xdlfcn.h>

-static int

-do_test (void)

+/* Run the test multiple times, to check finding a new namespace while

+   another namespace is already in use.  This used to trigger bug 29600.  */

+static void

+recurse (int depth)

 {

-  void *handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-twice-mod1.so", RTLD_NOW);

+  if (depth == 0)

+    return;

+

+  printf ("info: running at depth %d\n", depth);

+  void *handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-twice-mod1.so",

+                           RTLD_NOW);

   xdlclose (handle);

   handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-twice-mod2.so", RTLD_NOW);

   int (*run_check) (void) = xdlsym (handle, "run_check");

   TEST_COMPARE (run_check (), 0);

+  recurse (depth - 1);

   xdlclose (handle);

+}

+

+static int

+do_test (void)

+{

+  /* First run the test without nesting.  */

+  recurse (1);

+

+  /* Then with nesting.  The constant needs to be less than the

+     internal DL_NNS namespace constant.  */

+  recurse (10);

   return 0;

 }