diff options
| author | Andrew Kaster <andrewdkaster@gmail.com> | 2021-05-27 17:52:18 -0600 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-05-28 07:59:41 +0200 |
| commit | 1ecf2dad4b3c26b94be3fe13c1b23d1b61d926de (patch) | |
| tree | 47b8407d9ec32976188ef4917a15347eef1cefb4 /Userland/Libraries/LibJS | |
| parent | 212365130d84f9d3bf9e46b91f72987b01bfcd8e (diff) | |
| download | serenity-1ecf2dad4b3c26b94be3fe13c1b23d1b61d926de.zip | |
LibJS: Poison unused heap blocks until they are re-allocated
This is the coarsest grained ASAN instrumentation possible for the LibJS
heap. Future instrumentation could add red-zones to heap block
allocations, and poison the entire heap block and only un-poison used
cells at the CellAllocator level.
Diffstat (limited to 'Userland/Libraries/LibJS')
| -rw-r--r-- | Userland/Libraries/LibJS/Heap/BlockAllocator.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp b/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp index 50e0f096ba..5cdf228d30 100644 --- a/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp +++ b/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include <AK/Platform.h> #include <AK/Vector.h> #include <LibJS/Forward.h> #include <LibJS/Heap/BlockAllocator.h> @@ -11,6 +12,10 @@ #include <stdlib.h> #include <sys/mman.h> +#ifdef HAS_ADDRESS_SANITIZER +# include <sanitizer/asan_interface.h> +#endif + namespace JS { BlockAllocator::BlockAllocator() @@ -20,6 +25,7 @@ BlockAllocator::BlockAllocator() BlockAllocator::~BlockAllocator() { for (auto* block : m_blocks) { + ASAN_UNPOISON_MEMORY_REGION(block, HeapBlock::block_size); #ifdef __serenity__ if (munmap(block, HeapBlock::block_size) < 0) { perror("munmap"); @@ -35,6 +41,7 @@ void* BlockAllocator::allocate_block([[maybe_unused]] char const* name) { if (!m_blocks.is_empty()) { auto* block = m_blocks.take_last(); + ASAN_UNPOISON_MEMORY_REGION(block, HeapBlock::block_size); #ifdef __serenity__ if (set_mmap_name(block, HeapBlock::block_size, name) < 0) { perror("set_mmap_name"); @@ -69,6 +76,7 @@ void BlockAllocator::deallocate_block(void* block) return; } + ASAN_POISON_MEMORY_REGION(block, HeapBlock::block_size); m_blocks.append(block); } |