From: Roland McGrath <roland@gnu.org>
Date: Sat, 26 Feb 2005 01:09:47 +0000 (+0000)
Subject: 2005-02-21  Alan Modra <amodra@bigpond.net.au>
X-Git-Tag: cvs/glibc-2_3_5~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41615d03a5b5704eed2f36bc0f58eee605a350cd;p=thirdparty%2Fglibc.git

2005-02-21  Alan Modra <amodra@bigpond.net.au>

	[BZ #719]
	* elf/dl-reloc.c (_dl_nothread_init_static_tls): Assert that dtv
	array index is within bounds.
2005-02-21  Ulrich Drepper  <drepper@redhat.com>

	[BZ #719]
	* elf/dl-reloc.c (_dl_nothread_init_static_tls): Avoid using
	THREAD_DTV multiple times, this minimally reduces code size on
	some archs.
---

diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 4004316c5a3..893b3c954a0 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -114,7 +114,9 @@ _dl_nothread_init_static_tls (struct link_map *map)
 # endif
 
   /* Fill in the DTV slot so that a later LD/GD access will find it.  */
-  THREAD_DTV ()[map->l_tls_modid].pointer = dest;
+  dtv_t *dtv = THREAD_DTV ();
+  assert (map->l_tls_modid <= dtv[-1].counter);
+  dtv[map->l_tls_modid].pointer = dest;
 
   /* Initialize the memory.  */
   memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),