[1/3] ld.so: Export tls_init_tp_called as __rtld_tls_init_tp_called

Message ID d3397c7822cf320281bc5ac297141d9fadb35fd1.1581797592.git.fweimer@redhat.com
State New
Headers show
Series
  • Full removal of libc.so/ld.so interposition (bug 25486)
Related show

Commit Message

Florian Weimer Feb. 15, 2020, 8:18 p.m.
This allows the rest of dynamic loader to check whether the TCB
has been set up (and THREAD_GETMEM and THREAD_SETMEM will work).
---
 elf/rtld.c                 | 12 ++++++------
 sysdeps/generic/ldsodefs.h |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

-- 
2.24.1

Patch

diff --git a/elf/rtld.c b/elf/rtld.c
index 51dfaf966a..15850d3fd9 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -695,7 +695,7 @@  match_version (const char *string, struct link_map *map)
   return 0;
 }
 
-static bool tls_init_tp_called;
+bool __rtld_tls_init_tp_called;
 
 static void *
 init_tls (void)
@@ -761,7 +761,7 @@  cannot allocate TLS data structures for initial thread\n");
   const char *lossage = TLS_INIT_TP (tcbp);
   if (__glibc_unlikely (lossage != NULL))
     _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage);
-  tls_init_tp_called = true;
+  __rtld_tls_init_tp_called = true;
 
   return tcbp;
 }
@@ -1875,7 +1875,7 @@  ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
      an old kernel that can't perform TLS_INIT_TP, even if no TLS is ever
      used.  Trying to do it lazily is too hairy to try when there could be
      multiple threads (from a non-TLS-using libpthread).  */
-  bool was_tls_init_tp_called = tls_init_tp_called;
+  bool was_tls_init_tp_called = __rtld_tls_init_tp_called;
   if (tcbp == NULL)
     tcbp = init_tls ();
 
@@ -2226,7 +2226,7 @@  ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
 	    _dl_protect_relro (l);
 
 	  /* Add object to slot information data if necessasy.  */
-	  if (l->l_tls_blocksize != 0 && tls_init_tp_called)
+	  if (l->l_tls_blocksize != 0 && __rtld_tls_init_tp_called)
 	    _dl_add_to_slotinfo (l, true);
 	}
     }
@@ -2271,7 +2271,7 @@  ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
 				 consider_profiling);
 
 	  /* Add object to slot information data if necessasy.  */
-	  if (l->l_tls_blocksize != 0 && tls_init_tp_called)
+	  if (l->l_tls_blocksize != 0 && __rtld_tls_init_tp_called)
 	    _dl_add_to_slotinfo (l, true);
 	}
       rtld_timer_stop (&relocate_time, start);
@@ -2297,7 +2297,7 @@  ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
   _dl_allocate_tls_init (tcbp);
 
   /* And finally install it for the main thread.  */
-  if (! tls_init_tp_called)
+  if (! __rtld_tls_init_tp_called)
     {
       const char *lossage = TLS_INIT_TP (tcbp);
       if (__glibc_unlikely (lossage != NULL))
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 497938ffa2..4b4e26b778 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1122,6 +1122,9 @@  extern void *_dl_allocate_tls_storage (void) attribute_hidden;
 extern void *_dl_allocate_tls_init (void *);
 rtld_hidden_proto (_dl_allocate_tls_init)
 
+/* True if the TCB has been set up.  */
+extern bool __rtld_tls_init_tp_called attribute_hidden;
+
 /* Deallocate memory allocated with _dl_allocate_tls.  */
 extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb);
 rtld_hidden_proto (_dl_deallocate_tls)