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
130 lines
4.1 KiB
C++
130 lines
4.1 KiB
C++
//===-- asan_interceptors.h -------------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file is a part of AddressSanitizer, an address sanity checker.
|
|
//
|
|
// ASan-private header for asan_interceptors.cc
|
|
//===----------------------------------------------------------------------===//
|
|
#ifndef ASAN_INTERCEPTORS_H
|
|
#define ASAN_INTERCEPTORS_H
|
|
|
|
#include "asan_internal.h"
|
|
#include "asan_interceptors_memintrinsics.h"
|
|
#include "interception/interception.h"
|
|
#include "sanitizer_common/sanitizer_platform_interceptors.h"
|
|
|
|
namespace __asan {
|
|
|
|
void InitializeAsanInterceptors();
|
|
void InitializePlatformInterceptors();
|
|
|
|
#define ENSURE_ASAN_INITED() \
|
|
do { \
|
|
CHECK(!asan_init_is_running); \
|
|
if (UNLIKELY(!asan_inited)) { \
|
|
AsanInitFromRtl(); \
|
|
} \
|
|
} while (0)
|
|
|
|
} // namespace __asan
|
|
|
|
// There is no general interception at all on Fuchsia.
|
|
// Only the functions in asan_interceptors_memintrinsics.h are
|
|
// really defined to replace libc functions.
|
|
#if !SANITIZER_FUCHSIA
|
|
|
|
// Use macro to describe if specific function should be
|
|
// intercepted on a given platform.
|
|
#if !SANITIZER_WINDOWS
|
|
# define ASAN_INTERCEPT_ATOLL_AND_STRTOLL 1
|
|
# define ASAN_INTERCEPT__LONGJMP 1
|
|
# define ASAN_INTERCEPT_INDEX 1
|
|
# define ASAN_INTERCEPT_PTHREAD_CREATE 1
|
|
# define ASAN_INTERCEPT_FORK 1
|
|
#else
|
|
# define ASAN_INTERCEPT_ATOLL_AND_STRTOLL 0
|
|
# define ASAN_INTERCEPT__LONGJMP 0
|
|
# define ASAN_INTERCEPT_INDEX 0
|
|
# define ASAN_INTERCEPT_PTHREAD_CREATE 0
|
|
# define ASAN_INTERCEPT_FORK 0
|
|
#endif
|
|
|
|
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
|
|
# define ASAN_USE_ALIAS_ATTRIBUTE_FOR_INDEX 1
|
|
#else
|
|
# define ASAN_USE_ALIAS_ATTRIBUTE_FOR_INDEX 0
|
|
#endif
|
|
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
|
# define ASAN_INTERCEPT_SWAPCONTEXT 1
|
|
#else
|
|
# define ASAN_INTERCEPT_SWAPCONTEXT 0
|
|
#endif
|
|
|
|
#if !SANITIZER_WINDOWS
|
|
# define ASAN_INTERCEPT_SIGLONGJMP 1
|
|
#else
|
|
# define ASAN_INTERCEPT_SIGLONGJMP 0
|
|
#endif
|
|
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
|
# define ASAN_INTERCEPT___LONGJMP_CHK 1
|
|
#else
|
|
# define ASAN_INTERCEPT___LONGJMP_CHK 0
|
|
#endif
|
|
|
|
// Android bug: https://code.google.com/p/android/issues/detail?id=61799
|
|
#if ASAN_HAS_EXCEPTIONS && !SANITIZER_WINDOWS && \
|
|
!(SANITIZER_ANDROID && defined(__i386))
|
|
# define ASAN_INTERCEPT___CXA_THROW 1
|
|
#else
|
|
# define ASAN_INTERCEPT___CXA_THROW 0
|
|
#endif
|
|
|
|
#if !SANITIZER_WINDOWS
|
|
# define ASAN_INTERCEPT___CXA_ATEXIT 1
|
|
#else
|
|
# define ASAN_INTERCEPT___CXA_ATEXIT 0
|
|
#endif
|
|
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
|
# define ASAN_INTERCEPT___STRDUP 1
|
|
#else
|
|
# define ASAN_INTERCEPT___STRDUP 0
|
|
#endif
|
|
|
|
DECLARE_REAL(int, memcmp, const void *a1, const void *a2, uptr size)
|
|
DECLARE_REAL(char*, strchr, const char *str, int c)
|
|
DECLARE_REAL(SIZE_T, strlen, const char *s)
|
|
DECLARE_REAL(char*, strncpy, char *to, const char *from, uptr size)
|
|
DECLARE_REAL(uptr, strnlen, const char *s, uptr maxlen)
|
|
DECLARE_REAL(char*, strstr, const char *s1, const char *s2)
|
|
struct sigaction;
|
|
DECLARE_REAL(int, sigaction, int signum, const struct sigaction *act,
|
|
struct sigaction *oldact)
|
|
|
|
#if !SANITIZER_MAC
|
|
#define ASAN_INTERCEPT_FUNC(name) \
|
|
do { \
|
|
if ((!INTERCEPT_FUNCTION(name) || !REAL(name))) \
|
|
VReport(1, "AddressSanitizer: failed to intercept '" #name "'\n"); \
|
|
} while (0)
|
|
#define ASAN_INTERCEPT_FUNC_VER(name, ver) \
|
|
do { \
|
|
if ((!INTERCEPT_FUNCTION_VER(name, ver) || !REAL(name))) \
|
|
VReport( \
|
|
1, "AddressSanitizer: failed to intercept '" #name "@@" #ver "'\n"); \
|
|
} while (0)
|
|
#else
|
|
// OS X interceptors don't need to be initialized with INTERCEPT_FUNCTION.
|
|
#define ASAN_INTERCEPT_FUNC(name)
|
|
#endif // SANITIZER_MAC
|
|
|
|
#endif // !SANITIZER_FUCHSIA
|
|
|
|
#endif // ASAN_INTERCEPTORS_H
|