43917720a7
Summary: This patch changes a few (small) things around for compatibility purposes for the current Android & Fuchsia work: - `realloc`'ing some memory that was not allocated with `malloc`, `calloc` or `realloc`, while UB according to http://pubs.opengroup.org/onlinepubs/009695399/functions/realloc.html is more common that one would think. We now only check this if `DeallocationTypeMismatch` is set; change the "mismatch" error messages to be more homogeneous; - some sketchily written but widely used libraries expect a call to `realloc` to copy the usable size of the old chunk to the new one instead of the requested size. We have to begrundingly abide by this de-facto standard. This doesn't seem to impact security either way, unless someone comes up with something we didn't think about; - the CRC32 intrinsics for 64-bit take a 64-bit first argument. This is misleading as the upper 32 bits end up being ignored. This was also raising `-Wconversion` errors. Change things to take a `u32` as first argument. This also means we were (and are) only using 32 bits of the Cookie - not a big thing, but worth mentioning. - Includes-wise: prefer `stddef.h` to `cstddef`, move `scudo_flags.h` where it is actually needed. - Add tests for the memalign-realloc case, and the realloc-usable-size one. (Edited typos) Reviewers: alekseyshl Reviewed By: alekseyshl Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D36754 llvm-svn: 311018
75 lines
2.1 KiB
C++
75 lines
2.1 KiB
C++
//===-- scudo_new_delete.cpp ------------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
///
|
|
/// Interceptors for operators new and delete.
|
|
///
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "scudo_allocator.h"
|
|
|
|
#include "interception/interception.h"
|
|
|
|
#include <stddef.h>
|
|
|
|
using namespace __scudo;
|
|
|
|
#define CXX_OPERATOR_ATTRIBUTE INTERCEPTOR_ATTRIBUTE
|
|
|
|
// Fake std::nothrow_t to avoid including <new>.
|
|
namespace std {
|
|
struct nothrow_t {};
|
|
} // namespace std
|
|
|
|
// TODO(alekseys): throw std::bad_alloc instead of dying on OOM.
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void *operator new(size_t size) {
|
|
void *res = scudoMalloc(size, FromNew);
|
|
if (UNLIKELY(!res)) DieOnFailure::OnOOM();
|
|
return res;
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void *operator new[](size_t size) {
|
|
void *res = scudoMalloc(size, FromNewArray);
|
|
if (UNLIKELY(!res)) DieOnFailure::OnOOM();
|
|
return res;
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void *operator new(size_t size, std::nothrow_t const&) {
|
|
return scudoMalloc(size, FromNew);
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void *operator new[](size_t size, std::nothrow_t const&) {
|
|
return scudoMalloc(size, FromNewArray);
|
|
}
|
|
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void operator delete(void *ptr) NOEXCEPT {
|
|
return scudoFree(ptr, FromNew);
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void operator delete[](void *ptr) NOEXCEPT {
|
|
return scudoFree(ptr, FromNewArray);
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void operator delete(void *ptr, std::nothrow_t const&) NOEXCEPT {
|
|
return scudoFree(ptr, FromNew);
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void operator delete[](void *ptr, std::nothrow_t const&) NOEXCEPT {
|
|
return scudoFree(ptr, FromNewArray);
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void operator delete(void *ptr, size_t size) NOEXCEPT {
|
|
scudoSizedFree(ptr, size, FromNew);
|
|
}
|
|
CXX_OPERATOR_ATTRIBUTE
|
|
void operator delete[](void *ptr, size_t size) NOEXCEPT {
|
|
scudoSizedFree(ptr, size, FromNewArray);
|
|
}
|