summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2019-11-07 22:25:21 +0000
committerjoerg <joerg@NetBSD.org>2019-11-07 22:25:21 +0000
commitf656b03feab5b71f1d64cb0abc72e90e0d540c96 (patch)
tree7d67e11bf12d9ba26cefc0d8399219b08bdbb476
parent4ff4d104f2fda72f24f90fbdb63b18a4c2219abe (diff)
Mirror the ld.elf_so logic for handling aligning the TLS size.
Most noticable, recompute the start of the TLS area for variant I relative to the TCB. This makes a difference when the segment size and base alignment don't agree.
-rw-r--r--lib/libc/tls/tls.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/lib/libc/tls/tls.c b/lib/libc/tls/tls.c
index 3268044dd56..868a49a77b6 100644
--- a/lib/libc/tls/tls.c
+++ b/lib/libc/tls/tls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.11 2019/11/05 22:22:42 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.12 2019/11/07 22:25:21 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.11 2019/11/05 22:22:42 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.12 2019/11/07 22:25:21 joerg Exp $");
#include "namespace.h"
@@ -86,14 +86,16 @@ _rtld_tls_allocate(void)
if (initial_thread_tcb == NULL) {
#ifdef __HAVE_TLS_VARIANT_II
- tls_size = roundup2(tls_size, alignof(max_align_t));
+ tls_allocation = roundup2(tls_size, alignof(max_align_t));
+#else
+ tls_allocation = tls_size;
#endif
- tls_allocation = tls_size + sizeof(*tcb);
- initial_thread_tcb = p = mmap(NULL, tls_allocation,
- PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+ initial_thread_tcb = p = mmap(NULL,
+ tls_allocation + sizeof(*tcb), PROT_READ | PROT_WRITE,
+ MAP_ANON, -1, 0);
} else {
- p = calloc(1, tls_allocation);
+ p = calloc(1, tls_allocation + sizeof(*tcb));
}
if (p == NULL) {
static const char msg[] = "TLS allocation failed, terminating\n";
@@ -106,7 +108,8 @@ _rtld_tls_allocate(void)
p += sizeof(struct tls_tcb);
#else
/* LINTED tls_size is rounded above */
- tcb = (struct tls_tcb *)(p + tls_size);
+ tcb = (struct tls_tcb *)(p + tls_allocation);
+ p = (uint8_t *)tcb - tls_size;
tcb->tcb_self = tcb;
#endif
memcpy(p, tls_initaddr, tls_initsize);
@@ -126,10 +129,10 @@ _rtld_tls_free(struct tls_tcb *tcb)
p = (uint8_t *)tcb;
#else
/* LINTED */
- p = (uint8_t *)tcb - tls_size;
+ p = (uint8_t *)tcb - tls_allocation;
#endif
if (p == initial_thread_tcb)
- munmap(p, tls_allocation);
+ munmap(p, tls_allocation + sizeof(*tcb));
else
free(p);
}