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
66 lines
2.2 KiB
C++
66 lines
2.2 KiB
C++
//===-- sanitizer_signal_interceptors.inc -----------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Signal interceptors for sanitizers.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "interception/interception.h"
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_internal_defs.h"
|
|
#include "sanitizer_platform_interceptors.h"
|
|
|
|
using namespace __sanitizer;
|
|
|
|
#if SANITIZER_INTERCEPT_BSD_SIGNAL
|
|
INTERCEPTOR(void *, bsd_signal, int signum, void *handler) {
|
|
if (GetHandleSignalMode(signum) == kHandleSignalExclusive) return 0;
|
|
return REAL(bsd_signal)(signum, handler);
|
|
}
|
|
#define INIT_BSD_SIGNAL COMMON_INTERCEPT_FUNCTION(bsd_signal)
|
|
#else // SANITIZER_INTERCEPT_BSD_SIGNAL
|
|
#define INIT_BSD_SIGNAL
|
|
#endif // SANITIZER_INTERCEPT_BSD_SIGNAL
|
|
|
|
#if SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION
|
|
INTERCEPTOR(void *, signal, int signum, void *handler) {
|
|
if (GetHandleSignalMode(signum) == kHandleSignalExclusive) return nullptr;
|
|
return REAL(signal)(signum, handler);
|
|
}
|
|
#define INIT_SIGNAL COMMON_INTERCEPT_FUNCTION(signal)
|
|
|
|
INTERCEPTOR(int, sigaction, int signum, const struct sigaction *act,
|
|
struct sigaction *oldact) {
|
|
if (GetHandleSignalMode(signum) == kHandleSignalExclusive) return 0;
|
|
return REAL(sigaction)(signum, act, oldact);
|
|
}
|
|
#define INIT_SIGACTION COMMON_INTERCEPT_FUNCTION(sigaction)
|
|
|
|
namespace __sanitizer {
|
|
int real_sigaction(int signum, const void *act, void *oldact) {
|
|
return REAL(sigaction)(signum, (const struct sigaction *)act,
|
|
(struct sigaction *)oldact);
|
|
}
|
|
} // namespace __sanitizer
|
|
#else // SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION
|
|
#define INIT_SIGNAL
|
|
#define INIT_SIGACTION
|
|
// We need to have defined REAL(sigaction) on other systems.
|
|
DEFINE_REAL(int, sigaction, int signum, const struct sigaction *act,
|
|
struct sigaction *oldact)
|
|
#endif // SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION
|
|
|
|
static void InitializeSignalInterceptors() {
|
|
static bool was_called_once;
|
|
CHECK(!was_called_once);
|
|
was_called_once = true;
|
|
|
|
INIT_BSD_SIGNAL;
|
|
INIT_SIGNAL;
|
|
INIT_SIGACTION;
|
|
}
|