diff --git a/compiler-rt/lib/hwasan/hwasan_new_delete.cpp b/compiler-rt/lib/hwasan/hwasan_new_delete.cpp --- a/compiler-rt/lib/hwasan/hwasan_new_delete.cpp +++ b/compiler-rt/lib/hwasan/hwasan_new_delete.cpp @@ -92,6 +92,14 @@ void *ptr, std::nothrow_t const &) { OPERATOR_DELETE_BODY; } +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete( + void *ptr, size_t) NOEXCEPT { + OPERATOR_DELETE_BODY; +} +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete[]( + void *ptr, size_t) NOEXCEPT { + OPERATOR_DELETE_BODY; +} #endif // OPERATOR_NEW_BODY @@ -134,5 +142,13 @@ void *ptr, std::align_val_t, std::nothrow_t const &) NOEXCEPT { OPERATOR_DELETE_BODY; } +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete( + void *ptr, size_t, std::align_val_t, std::nothrow_t const &) NOEXCEPT { + OPERATOR_DELETE_BODY; +} +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete[]( + void *ptr, size_t, std::align_val_t, std::nothrow_t const &) NOEXCEPT { + OPERATOR_DELETE_BODY; +} #endif // OPERATOR_NEW_ALIGN_BODY diff --git a/compiler-rt/test/hwasan/TestCases/new-test.cpp b/compiler-rt/test/hwasan/TestCases/new-test.cpp --- a/compiler-rt/test/hwasan/TestCases/new-test.cpp +++ b/compiler-rt/test/hwasan/TestCases/new-test.cpp @@ -9,6 +9,100 @@ #include #include +void operator_new_delete(size_t size) { + void *alloc = operator new(size); + assert(alloc != nullptr); + assert(__sanitizer_get_allocated_size(alloc) == size); + operator delete(alloc); + + alloc = operator new(size); + assert(alloc != nullptr); + assert(__sanitizer_get_allocated_size(alloc) == size); + operator delete(alloc, size); +} + +void operator_new_delete_array(size_t size) { + void *alloc = operator new[](size); + assert(alloc != nullptr); + assert(__sanitizer_get_allocated_size(alloc) == size); + operator delete[](alloc); + + alloc = operator new[](size); + assert(alloc != nullptr); + assert(__sanitizer_get_allocated_size(alloc) == size); + operator delete[](alloc, size); +} + +void operator_new_delete(size_t size, std::align_val_t align) { + void *alloc = operator new(size, align); + assert(alloc != nullptr); + assert(reinterpret_cast(alloc) % static_cast(align) == 0); + assert(__sanitizer_get_allocated_size(alloc) >= size); + operator delete(alloc, align); + + alloc = operator new(size, align); + assert(alloc != nullptr); + assert(reinterpret_cast(alloc) % static_cast(align) == 0); + assert(__sanitizer_get_allocated_size(alloc) >= size); + operator delete(alloc, size, align); +} + +void operator_new_delete_array(size_t size, std::align_val_t align) { + void *alloc = operator new[](size, align); + assert(alloc != nullptr); + assert(reinterpret_cast(alloc) % static_cast(align) == 0); + assert(__sanitizer_get_allocated_size(alloc) >= size); + operator delete[](alloc, align); + + alloc = operator new[](size, align); + assert(alloc != nullptr); + assert(reinterpret_cast(alloc) % static_cast(align) == 0); + assert(__sanitizer_get_allocated_size(alloc) >= size); + operator delete[](alloc, size, align); +} + +void operator_new_delete(size_t size, const std::nothrow_t &tag) { + void *alloc = operator new(size, tag); + assert(alloc != nullptr); + assert(__sanitizer_get_allocated_size(alloc) == size); + operator delete(alloc, tag); +} + +void operator_new_delete_array(size_t size, const std::nothrow_t &tag) { + void *alloc = operator new[](size, tag); + assert(alloc != nullptr); + assert(__sanitizer_get_allocated_size(alloc) == size); + operator delete[](alloc, tag); +} + +void operator_new_delete(size_t size, std::align_val_t align, const std::nothrow_t &tag) { + void *alloc = operator new(size, align, tag); + assert(alloc != nullptr); + assert(reinterpret_cast(alloc) % static_cast(align) == 0); + assert(__sanitizer_get_allocated_size(alloc) >= size); + operator delete(alloc, align, tag); +} + +void operator_new_delete_array(size_t size, std::align_val_t align, const std::nothrow_t &tag) { + void *alloc = operator new[](size, align, tag); + assert(alloc != nullptr); + assert(reinterpret_cast(alloc) % static_cast(align) == 0); + assert(__sanitizer_get_allocated_size(alloc) >= size); + operator delete[](alloc, align, tag); +} + +void operator_new_delete(size_t size, void *ptr) { + void *alloc = operator new(size, ptr); + assert(alloc == ptr); + operator delete(alloc, ptr); +} + +void operator_new_delete_array(size_t size, void *ptr) { + void *alloc = operator new[](size, ptr); + assert(alloc == ptr); + operator delete[](alloc, ptr); +} + int main() { __hwasan_enable_allocator_tagging(); @@ -18,6 +112,16 @@ assert(__sanitizer_get_allocated_size(a1) == 1); delete[] a1; + constexpr size_t kSize = 8; + operator_new_delete(kSize); + operator_new_delete_array(kSize); + operator_new_delete(kSize, std::nothrow); + operator_new_delete_array(kSize, std::nothrow); + + char buffer[kSize]; + operator_new_delete(kSize, buffer); + operator_new_delete_array(kSize, buffer); + #if defined(__cpp_aligned_new) && \ (!defined(__GLIBCXX__) || \ (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7)) @@ -28,5 +132,14 @@ assert(reinterpret_cast(a2) % static_cast(kAlign) == 0); assert(__sanitizer_get_allocated_size(a2) >= 4); ::operator delete(a2, kAlign); + + operator_new_delete(kSize, std::align_val_t{kSize}); + operator_new_delete_array(kSize, std::align_val_t{kSize}); + operator_new_delete(kSize, std::align_val_t{kSize * 2}); + operator_new_delete_array(kSize, std::align_val_t{kSize * 2}); + operator_new_delete(kSize, std::align_val_t{kSize}, std::nothrow); + operator_new_delete_array(kSize, std::align_val_t{kSize}, std::nothrow); + operator_new_delete(kSize, std::align_val_t{kSize * 2}, std::nothrow); + operator_new_delete_array(kSize, std::align_val_t{kSize * 2}, std::nothrow); #endif }