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
95 lines
3.6 KiB
C++
95 lines
3.6 KiB
C++
//===-- asan_poisoning.h ----------------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file is a part of AddressSanitizer, an address sanity checker.
|
|
//
|
|
// Shadow memory poisoning by ASan RTL and by user application.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "asan_interceptors.h"
|
|
#include "asan_internal.h"
|
|
#include "asan_mapping.h"
|
|
#include "sanitizer_common/sanitizer_flags.h"
|
|
|
|
namespace __asan {
|
|
|
|
// Enable/disable memory poisoning.
|
|
void SetCanPoisonMemory(bool value);
|
|
bool CanPoisonMemory();
|
|
|
|
// Poisons the shadow memory for "size" bytes starting from "addr".
|
|
void PoisonShadow(uptr addr, uptr size, u8 value);
|
|
|
|
// Poisons the shadow memory for "redzone_size" bytes starting from
|
|
// "addr + size".
|
|
void PoisonShadowPartialRightRedzone(uptr addr,
|
|
uptr size,
|
|
uptr redzone_size,
|
|
u8 value);
|
|
|
|
// Fast versions of PoisonShadow and PoisonShadowPartialRightRedzone that
|
|
// assume that memory addresses are properly aligned. Use in
|
|
// performance-critical code with care.
|
|
ALWAYS_INLINE void FastPoisonShadow(uptr aligned_beg, uptr aligned_size,
|
|
u8 value) {
|
|
DCHECK(CanPoisonMemory());
|
|
uptr shadow_beg = MEM_TO_SHADOW(aligned_beg);
|
|
uptr shadow_end = MEM_TO_SHADOW(
|
|
aligned_beg + aligned_size - SHADOW_GRANULARITY) + 1;
|
|
// FIXME: Page states are different on Windows, so using the same interface
|
|
// for mapping shadow and zeroing out pages doesn't "just work", so we should
|
|
// probably provide higher-level interface for these operations.
|
|
// For now, just memset on Windows.
|
|
if (value || SANITIZER_WINDOWS == 1 ||
|
|
// TODO(mcgrathr): Fuchsia doesn't allow the shadow mapping to be
|
|
// changed at all. It doesn't currently have an efficient means
|
|
// to zero a bunch of pages, but maybe we should add one.
|
|
SANITIZER_FUCHSIA == 1 ||
|
|
shadow_end - shadow_beg < common_flags()->clear_shadow_mmap_threshold) {
|
|
REAL(memset)((void*)shadow_beg, value, shadow_end - shadow_beg);
|
|
} else {
|
|
uptr page_size = GetPageSizeCached();
|
|
uptr page_beg = RoundUpTo(shadow_beg, page_size);
|
|
uptr page_end = RoundDownTo(shadow_end, page_size);
|
|
|
|
if (page_beg >= page_end) {
|
|
REAL(memset)((void *)shadow_beg, 0, shadow_end - shadow_beg);
|
|
} else {
|
|
if (page_beg != shadow_beg) {
|
|
REAL(memset)((void *)shadow_beg, 0, page_beg - shadow_beg);
|
|
}
|
|
if (page_end != shadow_end) {
|
|
REAL(memset)((void *)page_end, 0, shadow_end - page_end);
|
|
}
|
|
ReserveShadowMemoryRange(page_beg, page_end - 1, nullptr);
|
|
}
|
|
}
|
|
}
|
|
|
|
ALWAYS_INLINE void FastPoisonShadowPartialRightRedzone(
|
|
uptr aligned_addr, uptr size, uptr redzone_size, u8 value) {
|
|
DCHECK(CanPoisonMemory());
|
|
bool poison_partial = flags()->poison_partial;
|
|
u8 *shadow = (u8*)MEM_TO_SHADOW(aligned_addr);
|
|
for (uptr i = 0; i < redzone_size; i += SHADOW_GRANULARITY, shadow++) {
|
|
if (i + SHADOW_GRANULARITY <= size) {
|
|
*shadow = 0; // fully addressable
|
|
} else if (i >= size) {
|
|
*shadow = (SHADOW_GRANULARITY == 128) ? 0xff : value; // unaddressable
|
|
} else {
|
|
// first size-i bytes are addressable
|
|
*shadow = poison_partial ? static_cast<u8>(size - i) : 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Calls __sanitizer::ReleaseMemoryPagesToOS() on
|
|
// [MemToShadow(p), MemToShadow(p+size)].
|
|
void FlushUnneededASanShadowMemory(uptr p, uptr size);
|
|
|
|
} // namespace __asan
|