procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR sanitizer/68824 (libtsan is missing the __interceptor___tls_get_addr symbol without bumping the soname)

Browse source 
PR sanitizer/68824
	* tsan/tsan_interceptors.cc (NEED_TLS_GET_ADDR, __tls_get_addr,
	InitializeInterceptors): Cherry pick upstream r258119.

From-SVN: r232555
This commit is contained in:
Jakub Jelinek 2016-01-19 13:45:54 +01:00 • committed by Jakub Jelinek
parent 569efc34eb
commit e47294194f
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libsanitizer/ChangeLog
View file

@ -1,3 +1,9 @@
2016-01-19 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/68824
* tsan/tsan_interceptors.cc (NEED_TLS_GET_ADDR, __tls_get_addr,
InitializeInterceptors): Cherry pick upstream r258119.
2016-01-14 Andreas Tobler <andreast@gcc.gnu.org>
* configure.ac: Replace the hard-coded -ldl requirement for

15
libsanitizer/tsan/tsan_interceptors.cc
View file

@ -2227,6 +2227,11 @@ static void HandleRecvmsg(ThreadState *thr, uptr pc,
// Since the interceptor only initializes memory for msan, the simplest solution
// is to disable the interceptor in tsan (other sanitizers do not call
// signal handlers from COMMON_INTERCEPTOR_ENTER).
// As __tls_get_addr has been intercepted in the past, to avoid breaking
// libtsan ABI, keep it around, but just call the real function.
#if SANITIZER_INTERCEPT_TLS_GET_ADDR
#define NEED_TLS_GET_ADDR
#endif
#undef SANITIZER_INTERCEPT_TLS_GET_ADDR
#define COMMON_INTERCEPT_FUNCTION(name) INTERCEPT_FUNCTION(name)
@ -2446,6 +2451,12 @@ static void syscall_post_fork(uptr pc, int pid) {
#include "sanitizer_common/sanitizer_common_syscalls.inc"
#ifdef NEED_TLS_GET_ADDR
TSAN_INTERCEPTOR(void *, __tls_get_addr, void *arg) {
return REAL(__tls_get_addr)(arg);
}
#endif
namespace __tsan {
static void finalize(void *arg) {
@ -2627,6 +2638,10 @@ void InitializeInterceptors() {
TSAN_INTERCEPT(__cxa_atexit);
TSAN_INTERCEPT(_exit);
#ifdef NEED_TLS_GET_ADDR
TSAN_INTERCEPT(__tls_get_addr);
#endif
#if !SANITIZER_MAC
// Need to setup it, because interceptors check that the function is resolved.
// But atexit is emitted directly into the module, so can't be resolved.