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
140 lines
4.3 KiB
C++
140 lines
4.3 KiB
C++
//===-- asan_activation.cc --------------------------------------*- 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 activation/deactivation logic.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "asan_activation.h"
|
|
#include "asan_allocator.h"
|
|
#include "asan_flags.h"
|
|
#include "asan_internal.h"
|
|
#include "asan_poisoning.h"
|
|
#include "asan_stack.h"
|
|
#include "sanitizer_common/sanitizer_flags.h"
|
|
|
|
namespace __asan {
|
|
|
|
static struct AsanDeactivatedFlags {
|
|
AllocatorOptions allocator_options;
|
|
int malloc_context_size;
|
|
bool poison_heap;
|
|
bool coverage;
|
|
const char *coverage_dir;
|
|
|
|
void RegisterActivationFlags(FlagParser *parser, Flags *f, CommonFlags *cf) {
|
|
#define ASAN_ACTIVATION_FLAG(Type, Name) \
|
|
RegisterFlag(parser, #Name, "", &f->Name);
|
|
#define COMMON_ACTIVATION_FLAG(Type, Name) \
|
|
RegisterFlag(parser, #Name, "", &cf->Name);
|
|
#include "asan_activation_flags.inc"
|
|
#undef ASAN_ACTIVATION_FLAG
|
|
#undef COMMON_ACTIVATION_FLAG
|
|
|
|
RegisterIncludeFlags(parser, cf);
|
|
}
|
|
|
|
void OverrideFromActivationFlags() {
|
|
Flags f;
|
|
CommonFlags cf;
|
|
FlagParser parser;
|
|
RegisterActivationFlags(&parser, &f, &cf);
|
|
|
|
cf.SetDefaults();
|
|
// Copy the current activation flags.
|
|
allocator_options.CopyTo(&f, &cf);
|
|
cf.malloc_context_size = malloc_context_size;
|
|
f.poison_heap = poison_heap;
|
|
cf.coverage = coverage;
|
|
cf.coverage_dir = coverage_dir;
|
|
cf.verbosity = Verbosity();
|
|
cf.help = false; // this is activation-specific help
|
|
|
|
// Check if activation flags need to be overriden.
|
|
if (const char *env = GetEnv("ASAN_ACTIVATION_OPTIONS")) {
|
|
parser.ParseString(env);
|
|
}
|
|
|
|
InitializeCommonFlags(&cf);
|
|
|
|
if (Verbosity()) ReportUnrecognizedFlags();
|
|
|
|
if (cf.help) parser.PrintFlagDescriptions();
|
|
|
|
allocator_options.SetFrom(&f, &cf);
|
|
malloc_context_size = cf.malloc_context_size;
|
|
poison_heap = f.poison_heap;
|
|
coverage = cf.coverage;
|
|
coverage_dir = cf.coverage_dir;
|
|
}
|
|
|
|
void Print() {
|
|
Report(
|
|
"quarantine_size_mb %d, thread_local_quarantine_size_kb %d, "
|
|
"max_redzone %d, poison_heap %d, malloc_context_size %d, "
|
|
"alloc_dealloc_mismatch %d, allocator_may_return_null %d, coverage %d, "
|
|
"coverage_dir %s, allocator_release_to_os_interval_ms %d\n",
|
|
allocator_options.quarantine_size_mb,
|
|
allocator_options.thread_local_quarantine_size_kb,
|
|
allocator_options.max_redzone, poison_heap, malloc_context_size,
|
|
allocator_options.alloc_dealloc_mismatch,
|
|
allocator_options.may_return_null, coverage, coverage_dir,
|
|
allocator_options.release_to_os_interval_ms);
|
|
}
|
|
} asan_deactivated_flags;
|
|
|
|
static bool asan_is_deactivated;
|
|
|
|
void AsanDeactivate() {
|
|
CHECK(!asan_is_deactivated);
|
|
VReport(1, "Deactivating ASan\n");
|
|
|
|
// Stash runtime state.
|
|
GetAllocatorOptions(&asan_deactivated_flags.allocator_options);
|
|
asan_deactivated_flags.malloc_context_size = GetMallocContextSize();
|
|
asan_deactivated_flags.poison_heap = CanPoisonMemory();
|
|
asan_deactivated_flags.coverage = common_flags()->coverage;
|
|
asan_deactivated_flags.coverage_dir = common_flags()->coverage_dir;
|
|
|
|
// Deactivate the runtime.
|
|
SetCanPoisonMemory(false);
|
|
SetMallocContextSize(1);
|
|
|
|
AllocatorOptions disabled = asan_deactivated_flags.allocator_options;
|
|
disabled.quarantine_size_mb = 0;
|
|
disabled.thread_local_quarantine_size_kb = 0;
|
|
disabled.min_redzone = 16; // Redzone must be at least 16 bytes long.
|
|
disabled.max_redzone = 16;
|
|
disabled.alloc_dealloc_mismatch = false;
|
|
disabled.may_return_null = true;
|
|
ReInitializeAllocator(disabled);
|
|
|
|
asan_is_deactivated = true;
|
|
}
|
|
|
|
void AsanActivate() {
|
|
if (!asan_is_deactivated) return;
|
|
VReport(1, "Activating ASan\n");
|
|
|
|
UpdateProcessName();
|
|
|
|
asan_deactivated_flags.OverrideFromActivationFlags();
|
|
|
|
SetCanPoisonMemory(asan_deactivated_flags.poison_heap);
|
|
SetMallocContextSize(asan_deactivated_flags.malloc_context_size);
|
|
ReInitializeAllocator(asan_deactivated_flags.allocator_options);
|
|
|
|
asan_is_deactivated = false;
|
|
if (Verbosity()) {
|
|
Report("Activated with flags:\n");
|
|
asan_deactivated_flags.Print();
|
|
}
|
|
}
|
|
|
|
} // namespace __asan
|