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
74 lines
2.5 KiB
C++
74 lines
2.5 KiB
C++
//===-- sanitizer_allocator_checks.h ----------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Various checks shared between ThreadSanitizer, MemorySanitizer, etc. memory
|
|
// allocators.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SANITIZER_ALLOCATOR_CHECKS_H
|
|
#define SANITIZER_ALLOCATOR_CHECKS_H
|
|
|
|
#include "sanitizer_internal_defs.h"
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_platform.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
// The following is defined in a separate compilation unit to avoid pulling in
|
|
// sanitizer_errno.h in this header, which leads to conflicts when other system
|
|
// headers include errno.h. This is usually the result of an unlikely event,
|
|
// and as such we do not care as much about having it inlined.
|
|
void SetErrnoToENOMEM();
|
|
|
|
// A common errno setting logic shared by almost all sanitizer allocator APIs.
|
|
INLINE void *SetErrnoOnNull(void *ptr) {
|
|
if (UNLIKELY(!ptr))
|
|
SetErrnoToENOMEM();
|
|
return ptr;
|
|
}
|
|
|
|
// In case of the check failure, the caller of the following Check... functions
|
|
// should "return POLICY::OnBadRequest();" where POLICY is the current allocator
|
|
// failure handling policy.
|
|
|
|
// Checks aligned_alloc() parameters, verifies that the alignment is a power of
|
|
// two and that the size is a multiple of alignment for POSIX implementation,
|
|
// and a bit relaxed requirement for non-POSIX ones, that the size is a multiple
|
|
// of alignment.
|
|
INLINE bool CheckAlignedAllocAlignmentAndSize(uptr alignment, uptr size) {
|
|
#if SANITIZER_POSIX
|
|
return IsPowerOfTwo(alignment) && (size & (alignment - 1)) == 0;
|
|
#else
|
|
return size % alignment == 0;
|
|
#endif
|
|
}
|
|
|
|
// Checks posix_memalign() parameters, verifies that alignment is a power of two
|
|
// and a multiple of sizeof(void *).
|
|
INLINE bool CheckPosixMemalignAlignment(uptr alignment) {
|
|
return IsPowerOfTwo(alignment) && (alignment % sizeof(void *)) == 0; // NOLINT
|
|
}
|
|
|
|
// Returns true if calloc(size, n) call overflows on size*n calculation.
|
|
INLINE bool CheckForCallocOverflow(uptr size, uptr n) {
|
|
if (!size)
|
|
return false;
|
|
uptr max = (uptr)-1L;
|
|
return (max / size) < n;
|
|
}
|
|
|
|
// Returns true if the size passed to pvalloc overflows when rounded to the next
|
|
// multiple of page_size.
|
|
INLINE bool CheckForPvallocOverflow(uptr size, uptr page_size) {
|
|
return RoundUpTo(size, page_size) < size;
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_ALLOCATOR_CHECKS_H
|