RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix buggy TLS size/alignment computations in static-linked TLS

This commit is contained in:
Rich Felker 2012-10-06 16:51:03 -04:00
parent bd17431a2c
commit 6a2eaa3c5b
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/env/__init_tls.c vendored
View File

@ -11,10 +11,23 @@ static size_t len, size, align;
void *__copy_tls(unsigned char *mem) void *__copy_tls(unsigned char *mem)
{ {
mem += -size & (4*sizeof(size_t)-1); pthread_t td;
mem += ((uintptr_t)image - (uintptr_t)mem) & (align-1); if (!image) return mem;
void **dtv = (void *)mem;
dtv[0] = (void *)1;
mem += __libc.tls_size - sizeof(struct pthread);
mem -= (uintptr_t)mem & (align-1);
td = (pthread_t)mem;
td->dtv = dtv;
mem -= size;
dtv[1] = mem;
memcpy(mem, image, len); memcpy(mem, image, len);
return mem + size; return td;
}
void *__tls_get_addr(size_t *v)
{
return (char *)__pthread_self()->dtv[1]+v[1];
} }
static void *simple(void *p) static void *simple(void *p)
@ -54,12 +67,16 @@ void __init_tls(size_t *auxv)
} }
if (!tls_phdr) return; if (!tls_phdr) return;
libc.tls_size = size+align+8*sizeof(size_t)+sizeof(struct pthread);
image = (void *)(base + tls_phdr->p_vaddr); image = (void *)(base + tls_phdr->p_vaddr);
len = tls_phdr->p_filesz; len = tls_phdr->p_filesz;
size = tls_phdr->p_memsz; size = tls_phdr->p_memsz;
align = tls_phdr->p_align; align = tls_phdr->p_align;
size += (-size - (uintptr_t)image) & (align-1);
if (align < 4*sizeof(size_t)) align = 4*sizeof(size_t);
libc.tls_size = 2*sizeof(void *)+size+align+sizeof(struct pthread);
mem = __mmap(0, libc.tls_size, PROT_READ|PROT_WRITE, mem = __mmap(0, libc.tls_size, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
if (mem == MAP_FAILED) a_crash(); if (mem == MAP_FAILED) a_crash();