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
128 lines
4.1 KiB
C++
128 lines
4.1 KiB
C++
//===-- sanitizer_libignore.cc --------------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "sanitizer_platform.h"
|
|
|
|
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || SANITIZER_NETBSD
|
|
|
|
#include "sanitizer_libignore.h"
|
|
#include "sanitizer_flags.h"
|
|
#include "sanitizer_posix.h"
|
|
#include "sanitizer_procmaps.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
LibIgnore::LibIgnore(LinkerInitialized) {
|
|
}
|
|
|
|
void LibIgnore::AddIgnoredLibrary(const char *name_templ) {
|
|
BlockingMutexLock lock(&mutex_);
|
|
if (count_ >= kMaxLibs) {
|
|
Report("%s: too many ignored libraries (max: %d)\n", SanitizerToolName,
|
|
kMaxLibs);
|
|
Die();
|
|
}
|
|
Lib *lib = &libs_[count_++];
|
|
lib->templ = internal_strdup(name_templ);
|
|
lib->name = nullptr;
|
|
lib->real_name = nullptr;
|
|
lib->loaded = false;
|
|
}
|
|
|
|
void LibIgnore::OnLibraryLoaded(const char *name) {
|
|
BlockingMutexLock lock(&mutex_);
|
|
// Try to match suppressions with symlink target.
|
|
InternalScopedString buf(kMaxPathLength);
|
|
if (name && internal_readlink(name, buf.data(), buf.size() - 1) > 0 &&
|
|
buf[0]) {
|
|
for (uptr i = 0; i < count_; i++) {
|
|
Lib *lib = &libs_[i];
|
|
if (!lib->loaded && (!lib->real_name) &&
|
|
TemplateMatch(lib->templ, name))
|
|
lib->real_name = internal_strdup(buf.data());
|
|
}
|
|
}
|
|
|
|
// Scan suppressions list and find newly loaded and unloaded libraries.
|
|
ListOfModules modules;
|
|
modules.init();
|
|
for (uptr i = 0; i < count_; i++) {
|
|
Lib *lib = &libs_[i];
|
|
bool loaded = false;
|
|
for (const auto &mod : modules) {
|
|
for (const auto &range : mod.ranges()) {
|
|
if (!range.executable)
|
|
continue;
|
|
if (!TemplateMatch(lib->templ, mod.full_name()) &&
|
|
!(lib->real_name &&
|
|
internal_strcmp(lib->real_name, mod.full_name()) == 0))
|
|
continue;
|
|
if (loaded) {
|
|
Report("%s: called_from_lib suppression '%s' is matched against"
|
|
" 2 libraries: '%s' and '%s'\n",
|
|
SanitizerToolName, lib->templ, lib->name, mod.full_name());
|
|
Die();
|
|
}
|
|
loaded = true;
|
|
if (lib->loaded)
|
|
continue;
|
|
VReport(1,
|
|
"Matched called_from_lib suppression '%s' against library"
|
|
" '%s'\n",
|
|
lib->templ, mod.full_name());
|
|
lib->loaded = true;
|
|
lib->name = internal_strdup(mod.full_name());
|
|
const uptr idx =
|
|
atomic_load(&ignored_ranges_count_, memory_order_relaxed);
|
|
CHECK_LT(idx, kMaxLibs);
|
|
ignored_code_ranges_[idx].begin = range.beg;
|
|
ignored_code_ranges_[idx].end = range.end;
|
|
atomic_store(&ignored_ranges_count_, idx + 1, memory_order_release);
|
|
break;
|
|
}
|
|
}
|
|
if (lib->loaded && !loaded) {
|
|
Report("%s: library '%s' that was matched against called_from_lib"
|
|
" suppression '%s' is unloaded\n",
|
|
SanitizerToolName, lib->name, lib->templ);
|
|
Die();
|
|
}
|
|
}
|
|
|
|
// Track instrumented ranges.
|
|
if (track_instrumented_libs_) {
|
|
for (const auto &mod : modules) {
|
|
if (!mod.instrumented())
|
|
continue;
|
|
for (const auto &range : mod.ranges()) {
|
|
if (!range.executable)
|
|
continue;
|
|
if (IsPcInstrumented(range.beg) && IsPcInstrumented(range.end - 1))
|
|
continue;
|
|
VReport(1, "Adding instrumented range %p-%p from library '%s'\n",
|
|
range.beg, range.end, mod.full_name());
|
|
const uptr idx =
|
|
atomic_load(&instrumented_ranges_count_, memory_order_relaxed);
|
|
CHECK_LT(idx, kMaxLibs);
|
|
instrumented_code_ranges_[idx].begin = range.beg;
|
|
instrumented_code_ranges_[idx].end = range.end;
|
|
atomic_store(&instrumented_ranges_count_, idx + 1,
|
|
memory_order_release);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void LibIgnore::OnLibraryUnloaded() {
|
|
OnLibraryLoaded(nullptr);
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC ||
|
|
// SANITIZER_NETBSD
|