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
98 lines
2.8 KiB
C++
98 lines
2.8 KiB
C++
//===-- sanitizer_procmaps.h ------------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file is shared between AddressSanitizer and ThreadSanitizer.
|
|
//
|
|
// Information about the process mappings.
|
|
//===----------------------------------------------------------------------===//
|
|
#ifndef SANITIZER_PROCMAPS_H
|
|
#define SANITIZER_PROCMAPS_H
|
|
|
|
#include "sanitizer_platform.h"
|
|
|
|
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_MAC
|
|
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_internal_defs.h"
|
|
#include "sanitizer_linux.h"
|
|
#include "sanitizer_mac.h"
|
|
#include "sanitizer_mutex.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
|
|
// Memory protection masks.
|
|
static const uptr kProtectionRead = 1;
|
|
static const uptr kProtectionWrite = 2;
|
|
static const uptr kProtectionExecute = 4;
|
|
static const uptr kProtectionShared = 8;
|
|
|
|
struct MemoryMappedSegmentData;
|
|
|
|
class MemoryMappedSegment {
|
|
public:
|
|
MemoryMappedSegment(char *buff = nullptr, uptr size = 0)
|
|
: filename(buff), filename_size(size), data_(nullptr) {}
|
|
~MemoryMappedSegment() {}
|
|
|
|
bool IsReadable() const { return protection & kProtectionRead; }
|
|
bool IsWritable() const { return protection & kProtectionWrite; }
|
|
bool IsExecutable() const { return protection & kProtectionExecute; }
|
|
bool IsShared() const { return protection & kProtectionShared; }
|
|
|
|
void AddAddressRanges(LoadedModule *module);
|
|
|
|
uptr start;
|
|
uptr end;
|
|
uptr offset;
|
|
char *filename; // owned by caller
|
|
uptr filename_size;
|
|
uptr protection;
|
|
ModuleArch arch;
|
|
u8 uuid[kModuleUUIDSize];
|
|
|
|
private:
|
|
friend class MemoryMappingLayout;
|
|
|
|
// This field is assigned and owned by MemoryMappingLayout if needed
|
|
MemoryMappedSegmentData *data_;
|
|
};
|
|
|
|
class MemoryMappingLayout {
|
|
public:
|
|
explicit MemoryMappingLayout(bool cache_enabled);
|
|
~MemoryMappingLayout();
|
|
bool Next(MemoryMappedSegment *segment);
|
|
void Reset();
|
|
// In some cases, e.g. when running under a sandbox on Linux, ASan is unable
|
|
// to obtain the memory mappings. It should fall back to pre-cached data
|
|
// instead of aborting.
|
|
static void CacheMemoryMappings();
|
|
|
|
// Adds all mapped objects into a vector.
|
|
void DumpListOfModules(InternalMmapVectorNoCtor<LoadedModule> *modules);
|
|
|
|
private:
|
|
void LoadFromCache();
|
|
|
|
MemoryMappingLayoutData data_;
|
|
};
|
|
|
|
// Returns code range for the specified module.
|
|
bool GetCodeRangeForFile(const char *module, uptr *start, uptr *end);
|
|
|
|
bool IsDecimal(char c);
|
|
uptr ParseDecimal(const char **p);
|
|
bool IsHex(char c);
|
|
uptr ParseHex(const char **p);
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD ||
|
|
// SANITIZER_MAC
|
|
#endif // SANITIZER_PROCMAPS_H
|