mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-30 23:35:00 +08:00
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
151 lines
5.0 KiB
C++
151 lines
5.0 KiB
C++
//===-- asan_win_dll_thunk.cc ---------------------------------------------===//
|
|
//
|
|
// 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.
|
|
//
|
|
// This file defines a family of thunks that should be statically linked into
|
|
// the DLLs that have ASan 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 "asan_init_version.h"
|
|
#include "interception/interception.h"
|
|
#include "sanitizer_common/sanitizer_win_defs.h"
|
|
#include "sanitizer_common/sanitizer_win_dll_thunk.h"
|
|
#include "sanitizer_common/sanitizer_platform_interceptors.h"
|
|
|
|
// ASan own interface functions.
|
|
#define INTERFACE_FUNCTION(Name) INTERCEPT_SANITIZER_FUNCTION(Name)
|
|
#define INTERFACE_WEAK_FUNCTION(Name) INTERCEPT_SANITIZER_WEAK_FUNCTION(Name)
|
|
#include "asan_interface.inc"
|
|
|
|
// Memory allocation functions.
|
|
INTERCEPT_WRAP_V_W(free)
|
|
INTERCEPT_WRAP_V_W(_free_base)
|
|
INTERCEPT_WRAP_V_WW(_free_dbg)
|
|
|
|
INTERCEPT_WRAP_W_W(malloc)
|
|
INTERCEPT_WRAP_W_W(_malloc_base)
|
|
INTERCEPT_WRAP_W_WWWW(_malloc_dbg)
|
|
|
|
INTERCEPT_WRAP_W_WW(calloc)
|
|
INTERCEPT_WRAP_W_WW(_calloc_base)
|
|
INTERCEPT_WRAP_W_WWWWW(_calloc_dbg)
|
|
INTERCEPT_WRAP_W_WWW(_calloc_impl)
|
|
|
|
INTERCEPT_WRAP_W_WW(realloc)
|
|
INTERCEPT_WRAP_W_WW(_realloc_base)
|
|
INTERCEPT_WRAP_W_WWW(_realloc_dbg)
|
|
INTERCEPT_WRAP_W_WWW(_recalloc)
|
|
INTERCEPT_WRAP_W_WWW(_recalloc_base)
|
|
|
|
INTERCEPT_WRAP_W_W(_msize)
|
|
INTERCEPT_WRAP_W_W(_expand)
|
|
INTERCEPT_WRAP_W_W(_expand_dbg)
|
|
|
|
// TODO(timurrrr): Might want to add support for _aligned_* allocation
|
|
// functions to detect a bit more bugs. Those functions seem to wrap malloc().
|
|
|
|
// TODO(timurrrr): Do we need to add _Crt* stuff here? (see asan_malloc_win.cc).
|
|
|
|
INTERCEPT_LIBRARY_FUNCTION(atoi);
|
|
INTERCEPT_LIBRARY_FUNCTION(atol);
|
|
INTERCEPT_LIBRARY_FUNCTION(frexp);
|
|
INTERCEPT_LIBRARY_FUNCTION(longjmp);
|
|
#if SANITIZER_INTERCEPT_MEMCHR
|
|
INTERCEPT_LIBRARY_FUNCTION(memchr);
|
|
#endif
|
|
INTERCEPT_LIBRARY_FUNCTION(memcmp);
|
|
INTERCEPT_LIBRARY_FUNCTION(memcpy);
|
|
INTERCEPT_LIBRARY_FUNCTION(memmove);
|
|
INTERCEPT_LIBRARY_FUNCTION(memset);
|
|
INTERCEPT_LIBRARY_FUNCTION(strcat); // NOLINT
|
|
INTERCEPT_LIBRARY_FUNCTION(strchr);
|
|
INTERCEPT_LIBRARY_FUNCTION(strcmp);
|
|
INTERCEPT_LIBRARY_FUNCTION(strcpy); // NOLINT
|
|
INTERCEPT_LIBRARY_FUNCTION(strcspn);
|
|
INTERCEPT_LIBRARY_FUNCTION(strdup);
|
|
INTERCEPT_LIBRARY_FUNCTION(strlen);
|
|
INTERCEPT_LIBRARY_FUNCTION(strncat);
|
|
INTERCEPT_LIBRARY_FUNCTION(strncmp);
|
|
INTERCEPT_LIBRARY_FUNCTION(strncpy);
|
|
INTERCEPT_LIBRARY_FUNCTION(strnlen);
|
|
INTERCEPT_LIBRARY_FUNCTION(strpbrk);
|
|
INTERCEPT_LIBRARY_FUNCTION(strrchr);
|
|
INTERCEPT_LIBRARY_FUNCTION(strspn);
|
|
INTERCEPT_LIBRARY_FUNCTION(strstr);
|
|
INTERCEPT_LIBRARY_FUNCTION(strtok);
|
|
INTERCEPT_LIBRARY_FUNCTION(strtol);
|
|
INTERCEPT_LIBRARY_FUNCTION(wcslen);
|
|
INTERCEPT_LIBRARY_FUNCTION(wcsnlen);
|
|
|
|
#ifdef _WIN64
|
|
INTERCEPT_LIBRARY_FUNCTION(__C_specific_handler);
|
|
#else
|
|
INTERCEPT_LIBRARY_FUNCTION(_except_handler3);
|
|
// _except_handler4 checks -GS cookie which is different for each module, so we
|
|
// can't use INTERCEPT_LIBRARY_FUNCTION(_except_handler4).
|
|
INTERCEPTOR(int, _except_handler4, void *a, void *b, void *c, void *d) {
|
|
__asan_handle_no_return();
|
|
return REAL(_except_handler4)(a, b, c, d);
|
|
}
|
|
#endif
|
|
|
|
// Window specific functions not included in asan_interface.inc.
|
|
INTERCEPT_WRAP_W_V(__asan_should_detect_stack_use_after_return)
|
|
INTERCEPT_WRAP_W_V(__asan_get_shadow_memory_dynamic_address)
|
|
INTERCEPT_WRAP_W_W(__asan_unhandled_exception_filter)
|
|
|
|
using namespace __sanitizer;
|
|
|
|
extern "C" {
|
|
int __asan_option_detect_stack_use_after_return;
|
|
uptr __asan_shadow_memory_dynamic_address;
|
|
} // extern "C"
|
|
|
|
static int asan_dll_thunk_init() {
|
|
typedef void (*fntype)();
|
|
static fntype fn = 0;
|
|
// asan_dll_thunk_init is expected to be called by only one thread.
|
|
if (fn) return 0;
|
|
|
|
// Ensure all interception was executed.
|
|
__dll_thunk_init();
|
|
|
|
fn = (fntype) dllThunkGetRealAddrOrDie("__asan_init");
|
|
fn();
|
|
__asan_option_detect_stack_use_after_return =
|
|
(__asan_should_detect_stack_use_after_return() != 0);
|
|
__asan_shadow_memory_dynamic_address =
|
|
(uptr)__asan_get_shadow_memory_dynamic_address();
|
|
|
|
#ifndef _WIN64
|
|
INTERCEPT_FUNCTION(_except_handler4);
|
|
#endif
|
|
// In DLLs, the callbacks are expected to return 0,
|
|
// otherwise CRT initialization fails.
|
|
return 0;
|
|
}
|
|
|
|
#pragma section(".CRT$XIB", long, read) // NOLINT
|
|
__declspec(allocate(".CRT$XIB")) int (*__asan_preinit)() = asan_dll_thunk_init;
|
|
|
|
static void WINAPI asan_thread_init(void *mod, unsigned long reason,
|
|
void *reserved) {
|
|
if (reason == /*DLL_PROCESS_ATTACH=*/1) asan_dll_thunk_init();
|
|
}
|
|
|
|
#pragma section(".CRT$XLAB", long, read) // NOLINT
|
|
__declspec(allocate(".CRT$XLAB")) void (WINAPI *__asan_tls_init)(void *,
|
|
unsigned long, void *) = asan_thread_init;
|
|
|
|
WIN_FORCE_LINK(__asan_dso_reg_hook)
|
|
|
|
#endif // SANITIZER_DLL_THUNK
|