lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

2002-08-05 Roland McGrath <roland@redhat.com>

Browse Source 
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace member
	`bool _dl_initial_dtv_malloced' with `void *_dl_initial_dtv'.
	* elf/rtld.c (dl_main): Set it to the new dtv for the main thread.
	* sysdeps/generic/dl-tls.c (__tls_get_addr): When reallocating the
	dtv, check if it matches _dl_initial_dtv; if so, malloc and copy the
	old data, abandoning the original memory allocated by rtld at startup,
	instead of calling realloc normally.
This commit is contained in:
Roland McGrath
2002-08-05 18:56:03 +00:00
parent 1614dd9fe0
commit 08da062122
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
elf/rtld.c
View File

@@ -1091,6 +1091,10 @@ of this helper program; chances are you did not intend to run this program.\n\
if (tcbp == NULL) if (tcbp == NULL)
_dl_fatal_printf ("\ _dl_fatal_printf ("\
cannot allocate TLS data structures for initial thread"); cannot allocate TLS data structures for initial thread");
/* Store for detection of the special case by __tls_get_addr
so it knows not to pass this dtv to the normal realloc. */
_dl_initial_dtv = GET_DTV (tcbp);
} }
#endif #endif

26
sysdeps/generic/dl-tls.c
View File

@@ -487,15 +487,29 @@ __tls_get_addr (GET_ADDR_ARGS)
assert (map->l_tls_modid <= newsize); assert (map->l_tls_modid <= newsize);
newp = (dtv_t *) realloc (&dtv[-1], if (dtv == GL(dl_initial_dtv))
(2 + newsize) {
* sizeof (dtv_t)); /* This is the initial dtv that was allocated
if (newp == NULL) during rtld startup using the dl-minimal.c
oom (); malloc instead of the real malloc. We can't
free it, we have to abandon the old storage. */
newp = malloc ((2 + newsize) * sizeof (dtv_t));
if (newp == NULL)
oom ();
memcpy (newp, &dtv[-1], oldsize * sizeof (dtv_t));
}
else
{
newp = realloc (&dtv[-1],
(2 + newsize) * sizeof (dtv_t));
if (newp == NULL)
oom ();
}
newp[0].counter = newsize; newp[0].counter = newsize;
/* Clear the newly allocate part. */ /* Clear the newly allocated part. */
memset (newp + 2 + oldsize, '\0', memset (newp + 2 + oldsize, '\0',
(newsize - oldsize) * sizeof (dtv_t)); (newsize - oldsize) * sizeof (dtv_t));

4
sysdeps/generic/ldsodefs.h
View File

@@ -323,8 +323,8 @@ struct rtld_global
/* Number of additional slots in the dtv allocated. */ /* Number of additional slots in the dtv allocated. */
# define DTV_SURPLUS (14) # define DTV_SURPLUS (14)
/* True if the dtv for the initial thread was malloc()ed. */ /* Initial dtv of the main thread, not allocated with normal malloc. */
EXTERN bool _dl_initial_dtv_malloced; EXTERN void *_dl_initial_dtv;
/* Generation counter for the dtv. */ /* Generation counter for the dtv. */
EXTERN size_t _dl_tls_generation; EXTERN size_t _dl_tls_generation;
#endif #endif