[PATCH 1/2] Revert "elf: Run constructors on cyclic recursive dlopen (bug 31986)"

[PATCH 1/2] Revert "elf: Run constructors on cyclic recursive dlopen (bug 31986)"

[Florian Weimer]

This reverts commit 9897ced8e78db5d813166a7ccccfd5a42c69ef20.

Adjust the test expectations in elf/tst-dlopen-auditdup-auditmod.c
accordingly.
---
 elf/Makefile                       |  5 ---
 elf/dl-open.c                      |  8 ----
 elf/dl-support.c                   |  1 -
 elf/tst-dlopen-auditdup-auditmod.c | 10 +++--
 elf/tst-dlopen-recurse.c           | 34 ---------------
 elf/tst-dlopen-recursemod1.c       | 50 ----------------------
 elf/tst-dlopen-recursemod2.c       | 66 ------------------------------
 7 files changed, 7 insertions(+), 167 deletions(-)
 delete mode 100644 elf/tst-dlopen-recurse.c
 delete mode 100644 elf/tst-dlopen-recursemod1.c
 delete mode 100644 elf/tst-dlopen-recursemod2.c

diff --git a/elf/Makefile b/elf/Makefile
index 9cfe738919..fda796f6d5 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -415,7 +415,6 @@ tests += \
   tst-dlmopen3 \
   tst-dlmopen4 \
   tst-dlopen-auditdup \
-  tst-dlopen-recurse \
   tst-dlopen-self \
   tst-dlopen-tlsmodid \
   tst-dlopen-tlsreinit1 \
@@ -869,8 +868,6 @@ modules-names += \
   tst-dlmopen1mod \
   tst-dlopen-auditdup-auditmod \
   tst-dlopen-auditdupmod \
-  tst-dlopen-recursemod1 \
-  tst-dlopen-recursemod2 \
   tst-dlopen-tlsreinitmod1 \
   tst-dlopen-tlsreinitmod2 \
   tst-dlopen-tlsreinitmod3 \
@@ -3160,8 +3157,6 @@ tst-dlopen-tlsreinit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 $(objpfx)tst-dlopen-tlsreinit4.out: $(objpfx)tst-auditmod1.so
 tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 
-$(objpfx)tst-dlopen-recurse.out: $(objpfx)tst-dlopen-recursemod1.so
-$(objpfx)tst-dlopen-recursemod1.so: $(objpfx)tst-dlopen-recursemod2.so
 tst-dlopen-auditdup-ENV = LD_AUDIT=$(objpfx)tst-dlopen-auditdup-auditmod.so
 $(objpfx)tst-dlopen-auditdup.out: \
   $(objpfx)tst-dlopen-auditdupmod.so $(objpfx)tst-dlopen-auditdup-auditmod.so
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 1d943dfbc3..ba3c266e6a 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -594,14 +594,6 @@ dl_open_worker_begin (void *a)
       if ((mode & RTLD_GLOBAL) && new->l_global == 0)
 	add_to_global_update (new);
 
-      /* Do not return without calling the (supposedly new) map's
-	 constructor.  This case occurs if a dependency of a directly
-	 opened map has a constructor that calls dlopen again on the
-	 initially opened map.  The new map is initialized last, so
-	 checking only it is enough.  */
-      if (!new->l_init_called)
-	_dl_catch_exception (NULL, call_dl_init, args);
-
       return;
     }
 
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 94e8197c63..451932dd03 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -99,7 +99,6 @@ static struct link_map _dl_main_map =
     .l_used = 1,
     .l_tls_offset = NO_TLS_OFFSET,
     .l_serial = 1,
-    .l_init_called = 1,
   };
 
 /* Namespace information.  */
diff --git a/elf/tst-dlopen-auditdup-auditmod.c b/elf/tst-dlopen-auditdup-auditmod.c
index 9b67295e94..270a595ec4 100644
--- a/elf/tst-dlopen-auditdup-auditmod.c
+++ b/elf/tst-dlopen-auditdup-auditmod.c
@@ -66,7 +66,11 @@ la_activity (uintptr_t *cookie, unsigned int flag)
           _exit (1);
         }
 
-      /* Check that the constructor has run.  */
+      /* Check that the constructor has not run.  Running the
+         constructor would require constructing its dependencies, but
+         the constructor call that triggered this auditing activity
+         has not completed, and constructors among the dependencies
+         may not be able to deal with that.  */
       int *status = dlsym (handle, "auditdupmod_status");
       if (status == NULL)
         {
@@ -75,9 +79,9 @@ la_activity (uintptr_t *cookie, unsigned int flag)
           _exit (1);
         }
       printf ("info: auditdupmod_status == %d\n", *status);
-      if (*status != 1)
+      if (*status != 0)
         {
-          puts ("error: auditdupmod_status == 1 expected");
+          puts ("error: auditdupmod_status == 0 expected");
           fflush (stdout);
           _exit (1);
         }
diff --git a/elf/tst-dlopen-recurse.c b/elf/tst-dlopen-recurse.c
deleted file mode 100644
index c7fb379d37..0000000000
--- a/elf/tst-dlopen-recurse.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Test that recursive dlopen runs constructors before return (bug 31986).
-   Copyright (C) 2024 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <stdio.h>
-#include <support/check.h>
-#include <support/xdlfcn.h>
-
-static int
-do_test (void)
-{
-  void *handle = xdlopen ("tst-dlopen-recursemod1.so", RTLD_NOW);
-  int *status = dlsym (handle, "recursemod1_status");
-  printf ("info: recursemod1_status == %d (from main)\n", *status);
-  TEST_COMPARE (*status, 2);
-  xdlclose (handle);
-  return 0;
-}
-
-#include <support/test-driver.c>
diff --git a/elf/tst-dlopen-recursemod1.c b/elf/tst-dlopen-recursemod1.c
deleted file mode 100644
index 5e0cc0eb8c..0000000000
--- a/elf/tst-dlopen-recursemod1.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Directly opened test module that gets recursively opened again.
-   Copyright (C) 2024 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <support/xdlfcn.h>
-
-int recursemod1_status;
-
-/* Force linking against st-dlopen-recursemod2.so.  Also allows
-   checking for relocation.  */
-extern int recursemod2_status;
-int *force_recursemod2_reference = &recursemod2_status;
-
-static void __attribute__ ((constructor))
-init (void)
-{
-  ++recursemod1_status;
-  printf ("info: tst-dlopen-recursemod1.so constructor called (status %d)\n",
-          recursemod1_status);
-}
-
-static void __attribute__ ((destructor))
-fini (void)
-{
-  /* The recursemod1_status variable was incremented in the
-     tst-dlopen-recursemod2.so constructor.  */
-  printf ("info: tst-dlopen-recursemod1.so destructor called (status %d)\n",
-          recursemod1_status);
-  if (recursemod1_status != 2)
-    {
-      puts ("error: recursemod1_status == 2 expected");
-      exit (1);
-    }
-}
diff --git a/elf/tst-dlopen-recursemod2.c b/elf/tst-dlopen-recursemod2.c
deleted file mode 100644
index edd2f2526b..0000000000
--- a/elf/tst-dlopen-recursemod2.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Indirectly opened module that recursively opens the directly opened module.
-   Copyright (C) 2024 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int recursemod2_status;
-
-static void __attribute__ ((constructor))
-init (void)
-{
-  ++recursemod2_status;
-  printf ("info: tst-dlopen-recursemod2.so constructor called (status %d)\n",
-          recursemod2_status);
-  void *handle = dlopen ("tst-dlopen-recursemod1.so", RTLD_NOW);
-  if (handle == NULL)
-    {
-      printf ("error: dlopen: %s\n", dlerror ());
-      exit (1);
-    }
-  int *status = dlsym (handle, "recursemod1_status");
-  if (status == NULL)
-    {
-      printf ("error: dlsym: %s\n", dlerror ());
-      exit (1);
-    }
-  printf ("info: recursemod1_status == %d\n", *status);
-  if (*status != 1)
-    {
-      puts ("error: recursemod1_status == 1 expected");
-      exit (1);
-    }
-  ++*status;
-  printf ("info: recursemod1_status == %d\n", *status);
-
-  int **mod2_status = dlsym (handle, "force_recursemod2_reference");
-  if (mod2_status == NULL || *mod2_status != &recursemod2_status)
-    {
-      puts ("error: invalid recursemod2_status address in"
-            " tst-dlopen-recursemod1.so");
-      exit (1);
-    }
-}
-
-static void __attribute__ ((destructor))
-fini (void)
-{
-  printf  ("info: tst-dlopen-recursemod2.so destructor called (status %d)\n",
-           recursemod2_status);
-}

base-commit: ac73067cb7a328bf106ecd041c020fc61be7e087
-- 
2.47.0

[PATCH 2/2] elf: Test dlopen (NULL, RTLD_LAZY) from an ELF constructor

[Florian Weimer]

This call must not complete initialization of all shared objects
in the global scope because the ELF constructor which makes the call
likely has not finished initialization.  Calling more constructors
at this point would expose those to a partially constructed
dependency.

This completes the revert of commit 9897ced8e78db5d813166a7ccccfd5a
("elf: Run constructors on cyclic recursive dlopen (bug 31986)").
---
 elf/Makefile                           |  9 +++++
 elf/dl-open.c                          | 10 +++++
 elf/tst-dlopen-constructor-null-mod1.c | 55 ++++++++++++++++++++++++++
 elf/tst-dlopen-constructor-null-mod2.c | 37 +++++++++++++++++
 elf/tst-dlopen-constructor-null.c      | 38 ++++++++++++++++++
 5 files changed, 149 insertions(+)
 create mode 100644 elf/tst-dlopen-constructor-null-mod1.c
 create mode 100644 elf/tst-dlopen-constructor-null-mod2.c
 create mode 100644 elf/tst-dlopen-constructor-null.c

diff --git a/elf/Makefile b/elf/Makefile
index fda796f6d5..2376789ead 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -415,6 +415,7 @@ tests += \
   tst-dlmopen3 \
   tst-dlmopen4 \
   tst-dlopen-auditdup \
+  tst-dlopen-constructor-null \
   tst-dlopen-self \
   tst-dlopen-tlsmodid \
   tst-dlopen-tlsreinit1 \
@@ -868,6 +869,8 @@ modules-names += \
   tst-dlmopen1mod \
   tst-dlopen-auditdup-auditmod \
   tst-dlopen-auditdupmod \
+  tst-dlopen-constructor-null-mod1 \
+  tst-dlopen-constructor-null-mod2 \
   tst-dlopen-tlsreinitmod1 \
   tst-dlopen-tlsreinitmod2 \
   tst-dlopen-tlsreinitmod3 \
@@ -3160,3 +3163,9 @@ tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 tst-dlopen-auditdup-ENV = LD_AUDIT=$(objpfx)tst-dlopen-auditdup-auditmod.so
 $(objpfx)tst-dlopen-auditdup.out: \
   $(objpfx)tst-dlopen-auditdupmod.so $(objpfx)tst-dlopen-auditdup-auditmod.so
+
+$(objpfx)tst-dlopen-constructor-null: \
+  $(objpfx)tst-dlopen-constructor-null-mod1.so \
+  $(objpfx)tst-dlopen-constructor-null-mod2.so
+$(objpfx)tst-dlopen-constructor-null-mod2.so: \
+  $(objpfx)tst-dlopen-constructor-null-mod1.so
diff --git a/elf/dl-open.c b/elf/dl-open.c
index ba3c266e6a..8fdc631a1d 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -594,6 +594,16 @@ dl_open_worker_begin (void *a)
       if ((mode & RTLD_GLOBAL) && new->l_global == 0)
 	add_to_global_update (new);
 
+      /* It is not possible to run the ELF constructor for the new
+	 link map if it has not executed yet: If this dlopen call came
+	 from an ELF constructor that has not put that object into a
+	 consistent state, completing initialization for the entire
+	 scope will expose objects that have this partially
+	 constructed object among its dependencies to this
+	 inconsistent state.  This could happen even with a benign
+	 dlopen (NULL, RTLD_LAZY) call from a constructor of an
+	 initially loaded shared object.  */
+
       return;
     }
 
diff --git a/elf/tst-dlopen-constructor-null-mod1.c b/elf/tst-dlopen-constructor-null-mod1.c
new file mode 100644
index 0000000000..70a7a0ad46
--- /dev/null
+++ b/elf/tst-dlopen-constructor-null-mod1.c
@@ -0,0 +1,55 @@
+/* Module calling dlopen (NULL, RTLD_LAZY) to obtain the global scope.
+   Copyright (C) 2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <dlfcn.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int mod1_status;
+
+static void __attribute__ ((constructor))
+init (void)
+{
+  puts ("info: tst-dlopen-constructor-null-mod1.so constructor");
+
+  void *handle = dlopen (NULL, RTLD_LAZY);
+  if (handle == NULL)
+    {
+      printf ("error: %s\n", dlerror ());
+      exit (1);
+    }
+  puts ("info: dlopen returned");
+  if (dlsym (handle, "malloc") != malloc)
+    {
+      puts ("error: dlsym did not produce expected result");
+      exit (1);
+    }
+  dlclose (handle);
+
+  /* Check that the second module's constructor has not executed.   */
+  if (getenv ("mod2_status") != NULL)
+    {
+      printf ("error: mod2_status environment variable set: %s\n",
+              getenv ("mod2_status"));
+      exit (1);
+    }
+
+  /* Communicate to the second module that the constructor executed.   */
+  mod1_status = 1;
+}
diff --git a/elf/tst-dlopen-constructor-null-mod2.c b/elf/tst-dlopen-constructor-null-mod2.c
new file mode 100644
index 0000000000..d6e945beae
--- /dev/null
+++ b/elf/tst-dlopen-constructor-null-mod2.c
@@ -0,0 +1,37 @@
+/* Module whose constructor should not be invoked by dlopen (NULL, RTLD_LAZY).
+   Copyright (C) 2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+extern int mod1_status;
+int mod2_status;
+
+static void __attribute__ ((constructor))
+init (void)
+{
+  printf ("info: tst-dlopen-constructor-null-mod2.so constructor"
+          " (mod1_status=%d)", mod1_status);
+  if (!(mod1_status == 1 && mod2_status == 0))
+    {
+      puts ("error: mod1_status == 1 && mod2_status == 0 expected");
+      exit (1);
+    }
+  setenv ("mod2_status", "constructed", 1);
+  mod2_status = 1;
+}
diff --git a/elf/tst-dlopen-constructor-null.c b/elf/tst-dlopen-constructor-null.c
new file mode 100644
index 0000000000..58c4660c7d
--- /dev/null
+++ b/elf/tst-dlopen-constructor-null.c
@@ -0,0 +1,38 @@
+/* Verify that dlopen (NULL, RTLD_LAZY) does not complete initialization.
+   Copyright (C) 2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+/* This test mimics what the glvndSetupPthreads function in libglvnd
+   does. */
+
+#include <stdlib.h>
+#include <support/check.h>
+
+/* Defined an initialized in the shared objects.  */
+extern int mod1_status;
+extern int mod2_status;
+
+static int
+do_test (void)
+{
+  TEST_COMPARE (mod1_status, 1);
+  TEST_COMPARE (mod2_status, 1);
+  TEST_COMPARE_STRING (getenv ("mod2_status"), "constructed");
+  return 0;
+}
+
+#include <support/test-driver.c>
-- 
2.47.0

Re: [PATCH 1/2] Revert "elf: Run constructors on cyclic recursive dlopen (bug 31986)"

[Carlos O'Donell]

On 10/26/24 9:52 AM, Florian Weimer wrote:
> This reverts commit 9897ced8e78db5d813166a7ccccfd5a42c69ef20.
> 
> Adjust the test expectations in elf/tst-dlopen-auditdup-auditmod.c
> accordingly.

If this is just a revert then it should go in no problem, no review required.

You'd only really want review for the new test case.

> ---
>  elf/Makefile                       |  5 ---
>  elf/dl-open.c                      |  8 ----
>  elf/dl-support.c                   |  1 -
>  elf/tst-dlopen-auditdup-auditmod.c | 10 +++--
>  elf/tst-dlopen-recurse.c           | 34 ---------------
>  elf/tst-dlopen-recursemod1.c       | 50 ----------------------
>  elf/tst-dlopen-recursemod2.c       | 66 ------------------------------
>  7 files changed, 7 insertions(+), 167 deletions(-)
>  delete mode 100644 elf/tst-dlopen-recurse.c
>  delete mode 100644 elf/tst-dlopen-recursemod1.c
>  delete mode 100644 elf/tst-dlopen-recursemod2.c
> 
> diff --git a/elf/Makefile b/elf/Makefile
> index 9cfe738919..fda796f6d5 100644
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -415,7 +415,6 @@ tests += \
>    tst-dlmopen3 \
>    tst-dlmopen4 \
>    tst-dlopen-auditdup \
> -  tst-dlopen-recurse \
>    tst-dlopen-self \
>    tst-dlopen-tlsmodid \
>    tst-dlopen-tlsreinit1 \
> @@ -869,8 +868,6 @@ modules-names += \
>    tst-dlmopen1mod \
>    tst-dlopen-auditdup-auditmod \
>    tst-dlopen-auditdupmod \
> -  tst-dlopen-recursemod1 \
> -  tst-dlopen-recursemod2 \
>    tst-dlopen-tlsreinitmod1 \
>    tst-dlopen-tlsreinitmod2 \
>    tst-dlopen-tlsreinitmod3 \
> @@ -3160,8 +3157,6 @@ tst-dlopen-tlsreinit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
>  $(objpfx)tst-dlopen-tlsreinit4.out: $(objpfx)tst-auditmod1.so
>  tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
>  
> -$(objpfx)tst-dlopen-recurse.out: $(objpfx)tst-dlopen-recursemod1.so
> -$(objpfx)tst-dlopen-recursemod1.so: $(objpfx)tst-dlopen-recursemod2.so
>  tst-dlopen-auditdup-ENV = LD_AUDIT=$(objpfx)tst-dlopen-auditdup-auditmod.so
>  $(objpfx)tst-dlopen-auditdup.out: \
>    $(objpfx)tst-dlopen-auditdupmod.so $(objpfx)tst-dlopen-auditdup-auditmod.so
> diff --git a/elf/dl-open.c b/elf/dl-open.c
> index 1d943dfbc3..ba3c266e6a 100644
> --- a/elf/dl-open.c
> +++ b/elf/dl-open.c
> @@ -594,14 +594,6 @@ dl_open_worker_begin (void *a)
>        if ((mode & RTLD_GLOBAL) && new->l_global == 0)
>  	add_to_global_update (new);
>  
> -      /* Do not return without calling the (supposedly new) map's
> -	 constructor.  This case occurs if a dependency of a directly
> -	 opened map has a constructor that calls dlopen again on the
> -	 initially opened map.  The new map is initialized last, so
> -	 checking only it is enough.  */
> -      if (!new->l_init_called)
> -	_dl_catch_exception (NULL, call_dl_init, args);
> -
>        return;
>      }
>  
> diff --git a/elf/dl-support.c b/elf/dl-support.c
> index 94e8197c63..451932dd03 100644
> --- a/elf/dl-support.c
> +++ b/elf/dl-support.c
> @@ -99,7 +99,6 @@ static struct link_map _dl_main_map =
>      .l_used = 1,
>      .l_tls_offset = NO_TLS_OFFSET,
>      .l_serial = 1,
> -    .l_init_called = 1,
>    };
>  
>  /* Namespace information.  */
> diff --git a/elf/tst-dlopen-auditdup-auditmod.c b/elf/tst-dlopen-auditdup-auditmod.c
> index 9b67295e94..270a595ec4 100644
> --- a/elf/tst-dlopen-auditdup-auditmod.c
> +++ b/elf/tst-dlopen-auditdup-auditmod.c
> @@ -66,7 +66,11 @@ la_activity (uintptr_t *cookie, unsigned int flag)
>            _exit (1);
>          }
>  
> -      /* Check that the constructor has run.  */
> +      /* Check that the constructor has not run.  Running the
> +         constructor would require constructing its dependencies, but
> +         the constructor call that triggered this auditing activity
> +         has not completed, and constructors among the dependencies
> +         may not be able to deal with that.  */
>        int *status = dlsym (handle, "auditdupmod_status");
>        if (status == NULL)
>          {
> @@ -75,9 +79,9 @@ la_activity (uintptr_t *cookie, unsigned int flag)
>            _exit (1);
>          }
>        printf ("info: auditdupmod_status == %d\n", *status);
> -      if (*status != 1)
> +      if (*status != 0)
>          {
> -          puts ("error: auditdupmod_status == 1 expected");
> +          puts ("error: auditdupmod_status == 0 expected");
>            fflush (stdout);
>            _exit (1);
>          }
> diff --git a/elf/tst-dlopen-recurse.c b/elf/tst-dlopen-recurse.c
> deleted file mode 100644
> index c7fb379d37..0000000000
> --- a/elf/tst-dlopen-recurse.c
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -/* Test that recursive dlopen runs constructors before return (bug 31986).
> -   Copyright (C) 2024 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -
> -   The GNU C Library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later version.
> -
> -   The GNU C Library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with the GNU C Library; if not, see
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#include <stdio.h>
> -#include <support/check.h>
> -#include <support/xdlfcn.h>
> -
> -static int
> -do_test (void)
> -{
> -  void *handle = xdlopen ("tst-dlopen-recursemod1.so", RTLD_NOW);
> -  int *status = dlsym (handle, "recursemod1_status");
> -  printf ("info: recursemod1_status == %d (from main)\n", *status);
> -  TEST_COMPARE (*status, 2);
> -  xdlclose (handle);
> -  return 0;
> -}
> -
> -#include <support/test-driver.c>
> diff --git a/elf/tst-dlopen-recursemod1.c b/elf/tst-dlopen-recursemod1.c
> deleted file mode 100644
> index 5e0cc0eb8c..0000000000
> --- a/elf/tst-dlopen-recursemod1.c
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -/* Directly opened test module that gets recursively opened again.
> -   Copyright (C) 2024 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -
> -   The GNU C Library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later version.
> -
> -   The GNU C Library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with the GNU C Library; if not, see
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <support/xdlfcn.h>
> -
> -int recursemod1_status;
> -
> -/* Force linking against st-dlopen-recursemod2.so.  Also allows
> -   checking for relocation.  */
> -extern int recursemod2_status;
> -int *force_recursemod2_reference = &recursemod2_status;
> -
> -static void __attribute__ ((constructor))
> -init (void)
> -{
> -  ++recursemod1_status;
> -  printf ("info: tst-dlopen-recursemod1.so constructor called (status %d)\n",
> -          recursemod1_status);
> -}
> -
> -static void __attribute__ ((destructor))
> -fini (void)
> -{
> -  /* The recursemod1_status variable was incremented in the
> -     tst-dlopen-recursemod2.so constructor.  */
> -  printf ("info: tst-dlopen-recursemod1.so destructor called (status %d)\n",
> -          recursemod1_status);
> -  if (recursemod1_status != 2)
> -    {
> -      puts ("error: recursemod1_status == 2 expected");
> -      exit (1);
> -    }
> -}
> diff --git a/elf/tst-dlopen-recursemod2.c b/elf/tst-dlopen-recursemod2.c
> deleted file mode 100644
> index edd2f2526b..0000000000
> --- a/elf/tst-dlopen-recursemod2.c
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -/* Indirectly opened module that recursively opens the directly opened module.
> -   Copyright (C) 2024 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -
> -   The GNU C Library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later version.
> -
> -   The GNU C Library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with the GNU C Library; if not, see
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#include <dlfcn.h>
> -#include <stdio.h>
> -#include <stdlib.h>
> -
> -int recursemod2_status;
> -
> -static void __attribute__ ((constructor))
> -init (void)
> -{
> -  ++recursemod2_status;
> -  printf ("info: tst-dlopen-recursemod2.so constructor called (status %d)\n",
> -          recursemod2_status);
> -  void *handle = dlopen ("tst-dlopen-recursemod1.so", RTLD_NOW);
> -  if (handle == NULL)
> -    {
> -      printf ("error: dlopen: %s\n", dlerror ());
> -      exit (1);
> -    }
> -  int *status = dlsym (handle, "recursemod1_status");
> -  if (status == NULL)
> -    {
> -      printf ("error: dlsym: %s\n", dlerror ());
> -      exit (1);
> -    }
> -  printf ("info: recursemod1_status == %d\n", *status);
> -  if (*status != 1)
> -    {
> -      puts ("error: recursemod1_status == 1 expected");
> -      exit (1);
> -    }
> -  ++*status;
> -  printf ("info: recursemod1_status == %d\n", *status);
> -
> -  int **mod2_status = dlsym (handle, "force_recursemod2_reference");
> -  if (mod2_status == NULL || *mod2_status != &recursemod2_status)
> -    {
> -      puts ("error: invalid recursemod2_status address in"
> -            " tst-dlopen-recursemod1.so");
> -      exit (1);
> -    }
> -}
> -
> -static void __attribute__ ((destructor))
> -fini (void)
> -{
> -  printf  ("info: tst-dlopen-recursemod2.so destructor called (status %d)\n",
> -           recursemod2_status);
> -}
> 
> base-commit: ac73067cb7a328bf106ecd041c020fc61be7e087

-- 
Cheers,
Carlos.