about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--elf/dl-reloc.c6
-rw-r--r--nptl/allocatestack.c5
3 files changed, 9 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index f70871d4ec..9ed7ff6883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-02-03  Alexandre Oliva  <aoliva@redhat.com>
+	    Florian Weimer  <fweimer@redhat.com>
+	    Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #20915]
+	* elf/dl-reloc.c (_dl_nothread_init_static_tls):
+	Do not initialize DTV.
+	* nptl/allocatestack.c (init_one_static_tls): Likewise.
+
 2017-02-03  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc64/fpu/multiarch/s_fmax-vis3.S: Remove file.
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 52311f0278..4ac558df52 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -137,12 +137,6 @@ _dl_nothread_init_static_tls (struct link_map *map)
 # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
 #endif
 
-  /* Fill in the DTV slot so that a later LD/GD access will find it.  */
-  dtv_t *dtv = THREAD_DTV ();
-  assert (map->l_tls_modid <= dtv[-1].counter);
-  dtv[map->l_tls_modid].pointer.to_free = NULL;
-  dtv[map->l_tls_modid].pointer.val = dest;
-
   /* Initialize the memory.  */
   memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
 	  '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 6402ea43f2..8a228ab254 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -1191,11 +1191,6 @@ init_one_static_tls (struct pthread *curp, struct link_map *map)
 #  error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
 # endif
 
-  /* Fill in the DTV slot so that a later LD/GD access will find it.  */
-  dtv_t *dtv = GET_DTV (TLS_TPADJ (curp));
-  dtv[map->l_tls_modid].pointer.to_free = NULL;
-  dtv[map->l_tls_modid].pointer.val = dest;
-
   /* Initialize the memory.  */
   memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
 	  '\0', map->l_tls_blocksize - map->l_tls_initimage_size);