diff options
authorAndrew Turner <andrew@FreeBSD.org>2015-09-01 15:43:56 +0000
committerAndrew Turner <andrew@FreeBSD.org>2015-09-01 15:43:56 +0000
commit878165d2ef412c30224e73381f44fcb4bbed38f9 (patch)
parent104dac63f3a52550501bc0bbbb86c77e001d11e1 (diff)
Ensure we use calculate_first_tls_offset, even if the main program doesn't
have TLS program header. This is needed on architectures with Variant I tls, that is arm, arm64, mips, and powerpc. These place the thread control block at the start of the buffer and, without this, this data may be trashed. This appears to not be an issue on mips or powerpc as they include a second adjustment to move the thread local data, however this is on arm64 (with a future change to fix placing this data), and should be on arm. I am unable to trigger this on arm, even after changing the code to move the data around to make it more likely to be hit. This is most likely because my tests didn't use the variable in offset 0. Reviewed by: kib MFC after: 1 week Sponsored by: ABT Systems Ltd
Notes: svn path=/head/; revision=287369
1 files changed, 1 insertions, 1 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 1d91460f4c19..eecfb0f70c71 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -4611,7 +4611,7 @@ allocate_tls_offset(Obj_Entry *obj)
return true;
- if (obj->tlsindex == 1)
+ if (tls_last_offset == 0)
off = calculate_first_tls_offset(obj->tlssize, obj->tlsalign);
off = calculate_tls_offset(tls_last_offset, tls_last_size,