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
101 lines
3.4 KiB
C++
101 lines
3.4 KiB
C++
//===-- sanitizer_win_dll_thunk.cc ----------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
// This file defines a family of thunks that should be statically linked into
|
|
// the DLLs that have instrumentation in order to delegate the calls to the
|
|
// shared runtime that lives in the main binary.
|
|
// See https://github.com/google/sanitizers/issues/209 for the details.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifdef SANITIZER_DLL_THUNK
|
|
#include "sanitizer_win_defs.h"
|
|
#include "sanitizer_win_dll_thunk.h"
|
|
#include "interception/interception.h"
|
|
|
|
extern "C" {
|
|
void *WINAPI GetModuleHandleA(const char *module_name);
|
|
void abort();
|
|
}
|
|
|
|
namespace __sanitizer {
|
|
uptr dllThunkGetRealAddrOrDie(const char *name) {
|
|
uptr ret =
|
|
__interception::InternalGetProcAddress((void *)GetModuleHandleA(0), name);
|
|
if (!ret)
|
|
abort();
|
|
return ret;
|
|
}
|
|
|
|
int dllThunkIntercept(const char* main_function, uptr dll_function) {
|
|
uptr wrapper = dllThunkGetRealAddrOrDie(main_function);
|
|
if (!__interception::OverrideFunction(dll_function, wrapper, 0))
|
|
abort();
|
|
return 0;
|
|
}
|
|
|
|
int dllThunkInterceptWhenPossible(const char* main_function,
|
|
const char* default_function, uptr dll_function) {
|
|
uptr wrapper = __interception::InternalGetProcAddress(
|
|
(void *)GetModuleHandleA(0), main_function);
|
|
if (!wrapper)
|
|
wrapper = dllThunkGetRealAddrOrDie(default_function);
|
|
if (!__interception::OverrideFunction(dll_function, wrapper, 0))
|
|
abort();
|
|
return 0;
|
|
}
|
|
} // namespace __sanitizer
|
|
|
|
// Include Sanitizer Common interface.
|
|
#define INTERFACE_FUNCTION(Name) INTERCEPT_SANITIZER_FUNCTION(Name)
|
|
#define INTERFACE_WEAK_FUNCTION(Name) INTERCEPT_SANITIZER_WEAK_FUNCTION(Name)
|
|
#include "sanitizer_common_interface.inc"
|
|
|
|
#pragma section(".DLLTH$A", read) // NOLINT
|
|
#pragma section(".DLLTH$Z", read) // NOLINT
|
|
|
|
typedef void (*DllThunkCB)();
|
|
extern "C" {
|
|
__declspec(allocate(".DLLTH$A")) DllThunkCB __start_dll_thunk;
|
|
__declspec(allocate(".DLLTH$Z")) DllThunkCB __stop_dll_thunk;
|
|
}
|
|
|
|
// Disable compiler warnings that show up if we declare our own version
|
|
// of a compiler intrinsic (e.g. strlen).
|
|
#pragma warning(disable: 4391)
|
|
#pragma warning(disable: 4392)
|
|
|
|
extern "C" int __dll_thunk_init() {
|
|
static bool flag = false;
|
|
// __dll_thunk_init is expected to be called by only one thread.
|
|
if (flag) return 0;
|
|
flag = true;
|
|
|
|
for (DllThunkCB *it = &__start_dll_thunk; it < &__stop_dll_thunk; ++it)
|
|
if (*it)
|
|
(*it)();
|
|
|
|
// In DLLs, the callbacks are expected to return 0,
|
|
// otherwise CRT initialization fails.
|
|
return 0;
|
|
}
|
|
|
|
// We want to call dll_thunk_init before C/C++ initializers / constructors are
|
|
// executed, otherwise functions like memset might be invoked.
|
|
#pragma section(".CRT$XIB", long, read) // NOLINT
|
|
__declspec(allocate(".CRT$XIB")) int (*__dll_thunk_preinit)() =
|
|
__dll_thunk_init;
|
|
|
|
static void WINAPI dll_thunk_thread_init(void *mod, unsigned long reason,
|
|
void *reserved) {
|
|
if (reason == /*DLL_PROCESS_ATTACH=*/1) __dll_thunk_init();
|
|
}
|
|
|
|
#pragma section(".CRT$XLAB", long, read) // NOLINT
|
|
__declspec(allocate(".CRT$XLAB")) void (WINAPI *__dll_thunk_tls_init)(void *,
|
|
unsigned long, void *) = dll_thunk_thread_init;
|
|
|
|
#endif // SANITIZER_DLL_THUNK
|