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
76 lines
2.7 KiB
C++
76 lines
2.7 KiB
C++
//===-- sanitizer_procmaps_linux.cc ---------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Information about the process mappings (Linux-specific parts).
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "sanitizer_platform.h"
|
|
#if SANITIZER_LINUX
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_procmaps.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
|
|
ReadFileToBuffer("/proc/self/maps", &proc_maps->data, &proc_maps->mmaped_size,
|
|
&proc_maps->len);
|
|
}
|
|
|
|
static bool IsOneOf(char c, char c1, char c2) {
|
|
return c == c1 || c == c2;
|
|
}
|
|
|
|
bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
|
|
char *last = data_.proc_self_maps.data + data_.proc_self_maps.len;
|
|
if (data_.current >= last) return false;
|
|
char *next_line =
|
|
(char *)internal_memchr(data_.current, '\n', last - data_.current);
|
|
if (next_line == 0)
|
|
next_line = last;
|
|
// Example: 08048000-08056000 r-xp 00000000 03:0c 64593 /foo/bar
|
|
segment->start = ParseHex(&data_.current);
|
|
CHECK_EQ(*data_.current++, '-');
|
|
segment->end = ParseHex(&data_.current);
|
|
CHECK_EQ(*data_.current++, ' ');
|
|
CHECK(IsOneOf(*data_.current, '-', 'r'));
|
|
segment->protection = 0;
|
|
if (*data_.current++ == 'r') segment->protection |= kProtectionRead;
|
|
CHECK(IsOneOf(*data_.current, '-', 'w'));
|
|
if (*data_.current++ == 'w') segment->protection |= kProtectionWrite;
|
|
CHECK(IsOneOf(*data_.current, '-', 'x'));
|
|
if (*data_.current++ == 'x') segment->protection |= kProtectionExecute;
|
|
CHECK(IsOneOf(*data_.current, 's', 'p'));
|
|
if (*data_.current++ == 's') segment->protection |= kProtectionShared;
|
|
CHECK_EQ(*data_.current++, ' ');
|
|
segment->offset = ParseHex(&data_.current);
|
|
CHECK_EQ(*data_.current++, ' ');
|
|
ParseHex(&data_.current);
|
|
CHECK_EQ(*data_.current++, ':');
|
|
ParseHex(&data_.current);
|
|
CHECK_EQ(*data_.current++, ' ');
|
|
while (IsDecimal(*data_.current)) data_.current++;
|
|
// Qemu may lack the trailing space.
|
|
// https://github.com/google/sanitizers/issues/160
|
|
// CHECK_EQ(*data_.current++, ' ');
|
|
// Skip spaces.
|
|
while (data_.current < next_line && *data_.current == ' ') data_.current++;
|
|
// Fill in the filename.
|
|
if (segment->filename) {
|
|
uptr len =
|
|
Min((uptr)(next_line - data_.current), segment->filename_size - 1);
|
|
internal_strncpy(segment->filename, data_.current, len);
|
|
segment->filename[len] = 0;
|
|
}
|
|
|
|
data_.current = next_line + 1;
|
|
return true;
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_LINUX
|