5d3805fca3
* ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch
builtins, store max (log2 (align), 0) into uchar field instead of
align into uptr field.
(ubsan_expand_objsize_ifn): Use _v1 suffixed type mismatch builtins,
store uchar 0 field instead of uptr 0 field.
(instrument_nonnull_return): Use _v1 suffixed nonnull return builtin,
instead of passing one address of struct with 2 locations pass
two addresses of structs with 1 location each.
* sanitizer.def (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH,
BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_ABORT,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_ABORT): Removed.
(BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1,
BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1_ABORT,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1_ABORT): New builtins.
* c-c++-common/ubsan/float-cast-overflow-1.c: Drop value keyword
from expected output regexps.
* c-c++-common/ubsan/float-cast-overflow-2.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-3.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-4.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-5.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-6.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-8.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-9.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-10.c: Likewise.
* g++.dg/ubsan/float-cast-overflow-bf.C: Likewise.
* gcc.dg/ubsan/float-cast-overflow-bf.c: Likewise.
* g++.dg/asan/default-options-1.C (__asan_default_options): Add
used attribute.
* g++.dg/asan/asan_test.C: Run with ASAN_OPTIONS=handle_segv=2
in the environment.
* All source files: Merge from upstream 315899.
* asan/Makefile.am (nodist_saninclude_HEADERS): Add
include/sanitizer/tsan_interface.h.
* asan/libtool-version: Bump the libasan SONAME.
* lsan/Makefile.am (sanitizer_lsan_files): Add lsan_common_mac.cc.
(lsan_files): Add lsan_linux.cc, lsan_mac.cc and lsan_malloc_mac.cc.
* sanitizer_common/Makefile.am (sanitizer_common_files): Add
sancov_flags.cc, sanitizer_allocator_checks.cc,
sanitizer_coverage_libcdep_new.cc, sanitizer_errno.cc,
sanitizer_file.cc, sanitizer_mac_libcdep.cc and
sanitizer_stoptheworld_mac.cc. Remove sanitizer_coverage_libcdep.cc
and sanitizer_coverage_mapping_libcdep.cc.
* tsan/Makefile.am (tsan_files): Add tsan_external.cc.
* ubsan/Makefile.am (DEFS): Add -DUBSAN_CAN_USE_CXXABI=1.
(ubsan_files): Add ubsan_init_standalone.cc and
ubsan_signals_standalone.cc.
* ubsan/libtool-version: Bump the libubsan SONAME.
* asan/Makefile.in: Regenerate.
* lsan/Makefile.in: Regenerate.
* sanitizer_common/Makefile.in: Regenerate.
* tsan/Makefile.in: Regenerate.
* ubsan/Makefile.in: Regenerate.
From-SVN: r253887
62 lines
2.1 KiB
C++
62 lines
2.1 KiB
C++
//===-- sanitizer_tls_get_addr.h --------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Handle the __tls_get_addr call.
|
|
//
|
|
// All this magic is specific to glibc and is required to workaround
|
|
// the lack of interface that would tell us about the Dynamic TLS (DTLS).
|
|
// https://sourceware.org/bugzilla/show_bug.cgi?id=16291
|
|
//
|
|
// The matters get worse because the glibc implementation changed between
|
|
// 2.18 and 2.19:
|
|
// https://groups.google.com/forum/#!topic/address-sanitizer/BfwYD8HMxTM
|
|
//
|
|
// Before 2.19, every DTLS chunk is allocated with __libc_memalign,
|
|
// which we intercept and thus know where is the DTLS.
|
|
// Since 2.19, DTLS chunks are allocated with __signal_safe_memalign,
|
|
// which is an internal function that wraps a mmap call, neither of which
|
|
// we can intercept. Luckily, __signal_safe_memalign has a simple parseable
|
|
// header which we can use.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SANITIZER_TLS_GET_ADDR_H
|
|
#define SANITIZER_TLS_GET_ADDR_H
|
|
|
|
#include "sanitizer_common.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
struct DTLS {
|
|
// Array of DTLS chunks for the current Thread.
|
|
// If beg == 0, the chunk is unused.
|
|
struct DTV {
|
|
uptr beg, size;
|
|
};
|
|
|
|
uptr dtv_size;
|
|
DTV *dtv; // dtv_size elements, allocated by MmapOrDie.
|
|
|
|
// Auxiliary fields, don't access them outside sanitizer_tls_get_addr.cc
|
|
uptr last_memalign_size;
|
|
uptr last_memalign_ptr;
|
|
};
|
|
|
|
// Returns pointer and size of a linker-allocated TLS block.
|
|
// Each block is returned exactly once.
|
|
DTLS::DTV *DTLS_on_tls_get_addr(void *arg, void *res, uptr static_tls_begin,
|
|
uptr static_tls_end);
|
|
void DTLS_on_libc_memalign(void *ptr, uptr size);
|
|
DTLS *DTLS_Get();
|
|
void DTLS_Destroy(); // Make sure to call this before the thread is destroyed.
|
|
// Returns true if DTLS of suspended thread is in destruction process.
|
|
bool DTLSInDestruction(DTLS *dtls);
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_TLS_GET_ADDR_H
|