diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-tls.c | 17 | ||||
| -rw-r--r-- | sysdeps/generic/libc-tls.c | 13 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c index 550de56530..725625d0fe 100644 --- a/sysdeps/generic/dl-tls.c +++ b/sysdeps/generic/dl-tls.c @@ -217,16 +217,13 @@ _dl_tls_setup (void) const size_t nelem = 2 + TLS_SLOTINFO_SURPLUS; - GL(dl_tls_dtv_slotinfo_list) = - malloc (sizeof (struct dtv_slotinfo_list) - + nelem * sizeof (struct dtv_slotinfo)); + GL(dl_tls_dtv_slotinfo_list) + = calloc (1, (sizeof (struct dtv_slotinfo_list) + + nelem * sizeof (struct dtv_slotinfo))); if (GL(dl_tls_dtv_slotinfo_list) == NULL) return -1; - memset (GL(dl_tls_dtv_slotinfo_list)->slotinfo, '\0', - nelem * sizeof (struct dtv_slotinfo)); GL(dl_tls_dtv_slotinfo_list)->len = nelem; - GL(dl_tls_dtv_slotinfo_list)->next = NULL; /* Number of elements in the static TLS block. It can't be zero because of various assumptions. The one element is null. */ @@ -251,14 +248,14 @@ allocate_dtv (void *result) initial set of modules. This should avoid in most cases expansions of the dtv. */ dtv_length = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS; - dtv = (dtv_t *) malloc ((dtv_length + 2) * sizeof (dtv_t)); + dtv = calloc (dtv_length + 2, sizeof (dtv_t)); if (dtv != NULL) { /* This is the initial length of the dtv. */ dtv[0].counter = dtv_length; - /* Initialize all of the rest of the dtv (including the - generation counter) with zero to indicate nothing there. */ - memset (dtv + 1, '\0', (dtv_length + 1) * sizeof (dtv_t)); + + /* The rest of the dtv (including the generation counter) is + Initialize with zero to indicate nothing there. */ /* Add the dtv to the thread data structures. */ INSTALL_DTV (result, dtv); diff --git a/sysdeps/generic/libc-tls.c b/sysdeps/generic/libc-tls.c index 756a2bf57c..5861e99e54 100644 --- a/sysdeps/generic/libc-tls.c +++ b/sysdeps/generic/libc-tls.c @@ -21,6 +21,7 @@ #include <ldsodefs.h> #include <tls.h> #include <unistd.h> +#include <stdio.h> #ifdef SHARED #error makefile bug, this file is for static only @@ -168,8 +169,8 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) /* Initialize the TLS block. */ # if TLS_TCB_AT_TP static_dtv[2].pointer = ((char *) tlsblock + tcb_offset - - roundup (memsz, align)); - static_map.l_tls_offset = roundup (memsz, align); + - roundup (memsz, align ?: 1)); + static_map.l_tls_offset = roundup (memsz, align ?: 1); # elif TLS_DTV_AT_TP tcb_offset = roundup (tcbsize, align); static_dtv[2].pointer = (char *) tlsblock + tcb_offset; @@ -177,8 +178,10 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) # else # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" # endif + /* sbrk gives us zero'd memory, so we don't need this. memset (__mempcpy (static_dtv[2].pointer, initimage, filesz), '\0', memsz - filesz); + */ /* Install the pointer to the dtv. */ @@ -186,13 +189,15 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) # if TLS_TCB_AT_TP INSTALL_DTV ((char *) tlsblock + tcb_offset, static_dtv); - TLS_INIT_TP ((char *) tlsblock + tcb_offset, 0); + const char *lossage = TLS_INIT_TP ((char *) tlsblock + tcb_offset, 0); # elif TLS_DTV_AT_TP INSTALL_DTV (tlsblock, static_dtv); - TLS_INIT_TP (tlsblock, 0); + const char *lossage = TLS_INIT_TP (tlsblock, 0); # else # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" # endif + if (__builtin_expect (lossage != NULL, 0)) + __libc_fatal (lossage); /* We have to create a fake link map which normally would be created by the dynamic linker. It just has to have enough information to |