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
102 lines
2.8 KiB
C++
102 lines
2.8 KiB
C++
//===-- sanitizer_procmaps_freebsd.cc -------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Information about the process mappings (FreeBSD and NetBSD-specific parts).
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "sanitizer_platform.h"
|
|
#if SANITIZER_FREEBSD || SANITIZER_NETBSD
|
|
#include "sanitizer_common.h"
|
|
#if SANITIZER_FREEBSD
|
|
#include "sanitizer_freebsd.h"
|
|
#endif
|
|
#include "sanitizer_procmaps.h"
|
|
|
|
#include <unistd.h>
|
|
#include <sys/sysctl.h>
|
|
#if SANITIZER_FREEBSD
|
|
#include <sys/user.h>
|
|
#endif
|
|
|
|
// Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
|
|
#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
|
|
# include <osreldate.h>
|
|
# if __FreeBSD_version <= 902001 // v9.2
|
|
# define kinfo_vmentry xkinfo_vmentry
|
|
# endif
|
|
#endif
|
|
|
|
namespace __sanitizer {
|
|
|
|
void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
|
|
const int Mib[] = {
|
|
#if SANITIZER_FREEBSD
|
|
CTL_KERN,
|
|
KERN_PROC,
|
|
KERN_PROC_VMMAP,
|
|
getpid()
|
|
#else
|
|
CTL_VM,
|
|
VM_PROC,
|
|
VM_PROC_MAP,
|
|
getpid(),
|
|
sizeof(struct kinfo_vmentry)
|
|
#endif
|
|
};
|
|
|
|
size_t Size = 0;
|
|
int Err = sysctl(Mib, ARRAY_SIZE(Mib), NULL, &Size, NULL, 0);
|
|
CHECK_EQ(Err, 0);
|
|
CHECK_GT(Size, 0);
|
|
|
|
size_t MmapedSize = Size * 4 / 3;
|
|
void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()");
|
|
Size = MmapedSize;
|
|
Err = sysctl(Mib, ARRAY_SIZE(Mib), VmMap, &Size, NULL, 0);
|
|
CHECK_EQ(Err, 0);
|
|
|
|
proc_maps->data = (char*)VmMap;
|
|
proc_maps->mmaped_size = MmapedSize;
|
|
proc_maps->len = Size;
|
|
}
|
|
|
|
bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
|
|
char *last = data_.proc_self_maps.data + data_.proc_self_maps.len;
|
|
if (data_.current >= last) return false;
|
|
struct kinfo_vmentry *VmEntry = (struct kinfo_vmentry *)data_.current;
|
|
|
|
segment->start = (uptr)VmEntry->kve_start;
|
|
segment->end = (uptr)VmEntry->kve_end;
|
|
segment->offset = (uptr)VmEntry->kve_offset;
|
|
|
|
segment->protection = 0;
|
|
if ((VmEntry->kve_protection & KVME_PROT_READ) != 0)
|
|
segment->protection |= kProtectionRead;
|
|
if ((VmEntry->kve_protection & KVME_PROT_WRITE) != 0)
|
|
segment->protection |= kProtectionWrite;
|
|
if ((VmEntry->kve_protection & KVME_PROT_EXEC) != 0)
|
|
segment->protection |= kProtectionExecute;
|
|
|
|
if (segment->filename != NULL && segment->filename_size > 0) {
|
|
internal_snprintf(segment->filename,
|
|
Min(segment->filename_size, (uptr)PATH_MAX), "%s",
|
|
VmEntry->kve_path);
|
|
}
|
|
|
|
#if SANITIZER_FREEBSD
|
|
data_.current += VmEntry->kve_structsize;
|
|
#else
|
|
data_.current += sizeof(*VmEntry);
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_FREEBSD || SANITIZER_NETBSD
|