From a7ad32f606418c8b5a13bef44b025e564b6438d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Tue, 18 Mar 2025 21:11:21 +0100 Subject: [PATCH] Add ASAN memory poisoning checks --- src/z_zone.cpp | 40 +++++++++++++++++++++++++++++++++++----- src/z_zone.h | 13 +++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/z_zone.cpp b/src/z_zone.cpp index b3e5b2938..73a62d832 100644 --- a/src/z_zone.cpp +++ b/src/z_zone.cpp @@ -156,6 +156,7 @@ void Z_Free(void *ptr) #endif block = MEMBLOCK(ptr); + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); #ifdef PARANOIA if (block->id != ZONEID) #ifdef ZDEBUG @@ -187,8 +188,13 @@ void Z_Free(void *ptr) #ifdef VALGRIND_DESTROY_MEMPOOL VALGRIND_DESTROY_MEMPOOL(block); #endif + + ASAN_UNPOISON_MEMORY_REGION(block->prev, sizeof(memblock_t)); block->prev->next = block->next; + ASAN_POISON_MEMORY_REGION(block->prev, sizeof(memblock_t)); + ASAN_UNPOISON_MEMORY_REGION(block->next, sizeof(memblock_t)); block->next->prev = block->prev; + ASAN_POISON_MEMORY_REGION(block->next, sizeof(memblock_t)); free(block); } @@ -259,7 +265,9 @@ void *Z_Malloc(size_t size, INT32 tag, void *user) block->next = head.next; block->prev = &head; head.next = block; + ASAN_UNPOISON_MEMORY_REGION(block->next, sizeof(memblock_t)); block->next->prev = block; + ASAN_POISON_MEMORY_REGION(block->next, sizeof(memblock_t)); block->tag = tag; block->user = NULL; @@ -286,6 +294,8 @@ void *Z_Malloc(size_t size, INT32 tag, void *user) I_Error("Z_Malloc: attempted to allocate purgable block " "(size %s) with no user", sizeu1(size)); + ASAN_POISON_MEMORY_REGION(block, sizeof(memblock_t)); + return ptr; } @@ -366,6 +376,7 @@ void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user) } block = MEMBLOCK(ptr); + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); #ifdef PARANOIA if (block->id != ZONEID) #ifdef ZDEBUG @@ -378,6 +389,12 @@ void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user) if (block == NULL) return NULL; + if (size < block->size) + copysize = size; + else + copysize = block->size; + ASAN_POISON_MEMORY_REGION(block, sizeof(memblock_t)); + #ifdef ZDEBUG #ifdef ZDEBUG2 // Write every Z_Realloc call to a debug file. @@ -388,11 +405,6 @@ void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user) rez = Z_Malloc(size, tag, user); #endif - if (size < block->size) - copysize = size; - else - copysize = block->size; - memcpy(rez, ptr, copysize); #ifdef ZDEBUG @@ -444,9 +456,12 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag) for (block = head.next; block != &head; block = next) { + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); next = block->next; // get link before freeing if (block->tag >= lowtag && block->tag <= hightag) Z_Free(MEMORY(block)); + else + ASAN_POISON_MEMORY_REGION(block, sizeof(memblock_t)); } } @@ -467,6 +482,7 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *)) for (block = head.next; block != &head; block = next) { + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); next = block->next; // get link before possibly freeing if (block->tag >= lowtag && block->tag <= hightag) @@ -475,6 +491,8 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *)) boolean free = iterfunc(mem); if (free) Z_Free(mem); + else + ASAN_POISON_MEMORY_REGION(block, sizeof(memblock_t)); } } } @@ -557,6 +575,7 @@ void Z_CheckHeap(INT32 tag) ); } #endif + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); if (block->user != NULL && *(block->user) != given) { I_Error("Z_CheckHeap :" @@ -577,6 +596,8 @@ void Z_CheckHeap(INT32 tag) #endif ); } + ASAN_UNPOISON_MEMORY_REGION(block->next, sizeof(memblock_t)); + if (block->next->prev != block) { I_Error("Z_CheckHeap :" @@ -597,6 +618,9 @@ void Z_CheckHeap(INT32 tag) #endif ); } + ASAN_POISON_MEMORY_REGION(block->next, sizeof(memblock_t)); + + ASAN_UNPOISON_MEMORY_REGION(block->prev, sizeof(memblock_t)); if (block->prev->next != block) { I_Error("Z_CheckHeap :" @@ -617,6 +641,7 @@ void Z_CheckHeap(INT32 tag) #endif ); } + ASAN_POISON_MEMORY_REGION(block->prev, sizeof(memblock_t)); #ifdef PARANOIA if (block->id != ZONEID) { @@ -639,6 +664,7 @@ void Z_CheckHeap(INT32 tag) ); } #endif + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); } } @@ -665,6 +691,7 @@ void Z_ChangeTag(void *ptr, INT32 tag) return; block = MEMBLOCK(ptr); + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); #ifdef PARANOIA if (block->id != ZONEID) I_Error("Z_ChangeTag at %s:%d: wrong id", file, line); @@ -675,6 +702,7 @@ void Z_ChangeTag(void *ptr, INT32 tag) "tried to make block purgable but it has no owner"); block->tag = tag; + ASAN_POISON_MEMORY_REGION(block, sizeof(memblock_t)); } /** Changes a memory block's user. @@ -697,6 +725,7 @@ void Z_SetUser(void *ptr, void **newuser) block = MEMBLOCK(ptr); + ASAN_UNPOISON_MEMORY_REGION(block, sizeof(memblock_t)); #ifdef PARANOIA if (block->id != ZONEID) I_Error("Z_SetUser at %s:%d: wrong id", file, line); #endif @@ -707,6 +736,7 @@ void Z_SetUser(void *ptr, void **newuser) block->user = (void**)newuser; *newuser = ptr; + ASAN_POISON_MEMORY_REGION(block, sizeof(memblock_t)); } // ----------------- diff --git a/src/z_zone.h b/src/z_zone.h index 38f00c48c..f7bc125ba 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -32,6 +32,19 @@ extern "C" { #define FUNCALLOC(x) #endif +#if defined(__SANITIZE_ADDRESS__) +# include +#elif defined(__has_feature) +# if __has_feature(address_sanitizer) +# include +# endif +#endif + +#if !defined(ASAN_POISON_MEMORY_REGION) +# define ASAN_POISON_MEMORY_REGION(a, b) {} +# define ASAN_UNPOISON_MEMORY_REGION(a, b) {} +#endif + #define ZDEBUG //