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
175 lines
5.2 KiB
C++
175 lines
5.2 KiB
C++
//===-- sanitizer_procmaps_common.cc --------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Information about the process mappings (common parts).
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "sanitizer_platform.h"
|
|
|
|
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
|
|
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_placement_new.h"
|
|
#include "sanitizer_procmaps.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
static ProcSelfMapsBuff cached_proc_self_maps;
|
|
static StaticSpinMutex cache_lock;
|
|
|
|
static int TranslateDigit(char c) {
|
|
if (c >= '0' && c <= '9')
|
|
return c - '0';
|
|
if (c >= 'a' && c <= 'f')
|
|
return c - 'a' + 10;
|
|
if (c >= 'A' && c <= 'F')
|
|
return c - 'A' + 10;
|
|
return -1;
|
|
}
|
|
|
|
// Parse a number and promote 'p' up to the first non-digit character.
|
|
static uptr ParseNumber(const char **p, int base) {
|
|
uptr n = 0;
|
|
int d;
|
|
CHECK(base >= 2 && base <= 16);
|
|
while ((d = TranslateDigit(**p)) >= 0 && d < base) {
|
|
n = n * base + d;
|
|
(*p)++;
|
|
}
|
|
return n;
|
|
}
|
|
|
|
bool IsDecimal(char c) {
|
|
int d = TranslateDigit(c);
|
|
return d >= 0 && d < 10;
|
|
}
|
|
|
|
uptr ParseDecimal(const char **p) {
|
|
return ParseNumber(p, 10);
|
|
}
|
|
|
|
bool IsHex(char c) {
|
|
int d = TranslateDigit(c);
|
|
return d >= 0 && d < 16;
|
|
}
|
|
|
|
uptr ParseHex(const char **p) {
|
|
return ParseNumber(p, 16);
|
|
}
|
|
|
|
void MemoryMappedSegment::AddAddressRanges(LoadedModule *module) {
|
|
// data_ should be unused on this platform
|
|
CHECK(!data_);
|
|
module->addAddressRange(start, end, IsExecutable(), IsWritable());
|
|
}
|
|
|
|
MemoryMappingLayout::MemoryMappingLayout(bool cache_enabled) {
|
|
ReadProcMaps(&data_.proc_self_maps);
|
|
if (cache_enabled) {
|
|
if (data_.proc_self_maps.mmaped_size == 0) {
|
|
LoadFromCache();
|
|
CHECK_GT(data_.proc_self_maps.len, 0);
|
|
}
|
|
} else {
|
|
CHECK_GT(data_.proc_self_maps.mmaped_size, 0);
|
|
}
|
|
Reset();
|
|
// FIXME: in the future we may want to cache the mappings on demand only.
|
|
if (cache_enabled)
|
|
CacheMemoryMappings();
|
|
}
|
|
|
|
MemoryMappingLayout::~MemoryMappingLayout() {
|
|
// Only unmap the buffer if it is different from the cached one. Otherwise
|
|
// it will be unmapped when the cache is refreshed.
|
|
if (data_.proc_self_maps.data != cached_proc_self_maps.data) {
|
|
UnmapOrDie(data_.proc_self_maps.data, data_.proc_self_maps.mmaped_size);
|
|
}
|
|
}
|
|
|
|
void MemoryMappingLayout::Reset() { data_.current = data_.proc_self_maps.data; }
|
|
|
|
// static
|
|
void MemoryMappingLayout::CacheMemoryMappings() {
|
|
SpinMutexLock l(&cache_lock);
|
|
// Don't invalidate the cache if the mappings are unavailable.
|
|
ProcSelfMapsBuff old_proc_self_maps;
|
|
old_proc_self_maps = cached_proc_self_maps;
|
|
ReadProcMaps(&cached_proc_self_maps);
|
|
if (cached_proc_self_maps.mmaped_size == 0) {
|
|
cached_proc_self_maps = old_proc_self_maps;
|
|
} else {
|
|
if (old_proc_self_maps.mmaped_size) {
|
|
UnmapOrDie(old_proc_self_maps.data,
|
|
old_proc_self_maps.mmaped_size);
|
|
}
|
|
}
|
|
}
|
|
|
|
void MemoryMappingLayout::LoadFromCache() {
|
|
SpinMutexLock l(&cache_lock);
|
|
if (cached_proc_self_maps.data) {
|
|
data_.proc_self_maps = cached_proc_self_maps;
|
|
}
|
|
}
|
|
|
|
void MemoryMappingLayout::DumpListOfModules(
|
|
InternalMmapVectorNoCtor<LoadedModule> *modules) {
|
|
Reset();
|
|
InternalScopedString module_name(kMaxPathLength);
|
|
MemoryMappedSegment segment(module_name.data(), module_name.size());
|
|
for (uptr i = 0; Next(&segment); i++) {
|
|
const char *cur_name = segment.filename;
|
|
if (cur_name[0] == '\0')
|
|
continue;
|
|
// Don't subtract 'cur_beg' from the first entry:
|
|
// * If a binary is compiled w/o -pie, then the first entry in
|
|
// process maps is likely the binary itself (all dynamic libs
|
|
// are mapped higher in address space). For such a binary,
|
|
// instruction offset in binary coincides with the actual
|
|
// instruction address in virtual memory (as code section
|
|
// is mapped to a fixed memory range).
|
|
// * If a binary is compiled with -pie, all the modules are
|
|
// mapped high at address space (in particular, higher than
|
|
// shadow memory of the tool), so the module can't be the
|
|
// first entry.
|
|
uptr base_address = (i ? segment.start : 0) - segment.offset;
|
|
LoadedModule cur_module;
|
|
cur_module.set(cur_name, base_address);
|
|
segment.AddAddressRanges(&cur_module);
|
|
modules->push_back(cur_module);
|
|
}
|
|
}
|
|
|
|
void GetMemoryProfile(fill_profile_f cb, uptr *stats, uptr stats_size) {
|
|
char *smaps = nullptr;
|
|
uptr smaps_cap = 0;
|
|
uptr smaps_len = 0;
|
|
if (!ReadFileToBuffer("/proc/self/smaps", &smaps, &smaps_cap, &smaps_len))
|
|
return;
|
|
uptr start = 0;
|
|
bool file = false;
|
|
const char *pos = smaps;
|
|
while (pos < smaps + smaps_len) {
|
|
if (IsHex(pos[0])) {
|
|
start = ParseHex(&pos);
|
|
for (; *pos != '/' && *pos > '\n'; pos++) {}
|
|
file = *pos == '/';
|
|
} else if (internal_strncmp(pos, "Rss:", 4) == 0) {
|
|
while (!IsDecimal(*pos)) pos++;
|
|
uptr rss = ParseDecimal(&pos) * 1024;
|
|
cb(start, rss, file, stats, stats_size);
|
|
}
|
|
while (*pos++ != '\n') {}
|
|
}
|
|
UnmapOrDie(smaps, smaps_cap);
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
|