about summary refs log tree commit diff
path: root/elf/dl-reloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-02-22 03:51:38 +0000
committerUlrich Drepper <drepper@redhat.com>2005-02-22 03:51:38 +0000
commite13e33e279e193191e06811cb7ae3518d7acad1a (patch)
treeaf79ff3fe269f056259402f256fdd3f0d78aab6e /elf/dl-reloc.c
parentaf272d4fa88306ec6a9c112cae6ebbb45f0b296e (diff)
downloadglibc-e13e33e279e193191e06811cb7ae3518d7acad1a.tar.gz
glibc-e13e33e279e193191e06811cb7ae3518d7acad1a.tar.xz
glibc-e13e33e279e193191e06811cb7ae3518d7acad1a.zip
2005-02-21 Alan Modra <amodra@bigpond.net.au>
	* elf/dl-reloc.c (_dl_nothread_init_static_tls): Assert that dtv
	array index is within bounds.

	* elf/dl-load.c: Do not allow PT_TLS in modules loaded in statically
	linked code.
	* sysdeps/generic/dl-tls.c [!SHARED]: Don't build _dl_next_tls_modid.
	* elf/Makefile: Remove rules to build and run tst-tls9-static.
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r--elf/dl-reloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index c3a58dd921..140093c6ce 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -125,6 +125,8 @@ _dl_nothread_init_static_tls (struct link_map *map)
 
   /* Fill in the DTV slot so that a later LD/GD access will find it.  */
   dtv_t *dtv = THREAD_DTV ();
+  _dl_printf("modid=%u, counter=%u\n", map->l_tls_modid, dtv[-1].counter);
+  assert (map->l_tls_modid <= dtv[-1].counter);
   dtv[map->l_tls_modid].pointer.val = dest;
   dtv[map->l_tls_modid].pointer.is_static = true;