Compare commits

..

2 Commits

Author SHA1 Message Date
Nils O. Selåsdal 256de68410 Integrate address sanitizer 2026-06-06 13:52:36 +02:00
Nils O. Selåsdal 45c6e7b952 Track checkpoint levels 2026-06-06 01:33:10 +02:00
5 changed files with 41 additions and 5 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
#!/bin/sh
set -x
gcc -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -std=gnu23 src/*c
gcc -fsanitize=address -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -std=gnu23 $CFLAGS src/*c
+15 -1
View File
@@ -26,6 +26,8 @@ Arena *arena_alloc_(const ArenaParams *params)
// Note: only backend now is malloc
void *base = memory_allocate(params->size);
//((U8*)base)[1023+ARENA_HEADER_SZ] = 1;
Assert(base != NULL);
Arena *arena = (Arena *)base;
@@ -35,7 +37,9 @@ Arena *arena_alloc_(const ArenaParams *params)
arena->pos = ARENA_HEADER_SZ;
arena->base_pos = 0;
arena->prev = NULL;
arena->checkpoint_level = 0;
ASAN_POISON_MEMORY_REGION(&arena->base[arena->pos], arena_available(arena));
return arena;
}
@@ -82,6 +86,7 @@ void *arena_push(Arena *arena, U32 size, U32 align)
U8 *mem = &current->base[start_pos];
current->pos = end_pos;
ASAN_UNPOISON_MEMORY_REGION(mem, size);
return mem;
}
@@ -93,6 +98,7 @@ void arena_pop_to(Arena *arena, U32 abs_pos)
Arena *prev = current->prev;
if (current->base_pos >= abs_pos) {
ASAN_UNPOISON_MEMORY_REGION(current->base, current->size);
memory_release(current->base);
arena->current = prev;
} else {
@@ -101,6 +107,7 @@ void arena_pop_to(Arena *arena, U32 abs_pos)
// is the right thing . shouldn't be able to pop to larger than what's already commited
Assert(new_pos <= current->size);
current->pos = new_pos;
ASAN_POISON_MEMORY_REGION(&current->base[current->pos], arena_available(arena));
break;
}
@@ -113,7 +120,7 @@ ArenaCheckPoint arena_temp_begin(Arena *arena)
ArenaCheckPoint checkpoint = {};
checkpoint.arena = arena;
checkpoint.absolute_pos = arena_absolute_pos(arena);
arena->checkpoint_level++;
return checkpoint;
}
@@ -121,4 +128,11 @@ void arena_temp_end(ArenaCheckPoint *checkpoint)
{
Arena *arena = checkpoint->arena;
arena_pop_to(arena, checkpoint->absolute_pos);
Assert(arena->checkpoint_level > 0);
arena->checkpoint_level--;
}
void arena_reset(Arena *arena)
{
arena_pop_to(arena, 0);
}
+15
View File
@@ -1,6 +1,19 @@
#pragma once
#include "base_core.h"
#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
#include <sanitizer/asan_interface.h>
#define ASAN_POISON_MEMORY_REGION(addr, size) \
__asan_poison_memory_region((addr), (size))
#define ASAN_UNPOISON_MEMORY_REGION(addr, size) \
__asan_unpoison_memory_region((addr), (size))
#else
#define ASAN_POISON_MEMORY_REGION(addr, size) \
((void)(addr), (void)(size))
#define ASAN_UNPOISON_MEMORY_REGION(addr, size) \
((void)(addr), (void)(size))
#endif
typedef U32 ArenaFlags;
typedef struct ArenaParams ArenaParams;
@@ -21,6 +34,7 @@ struct Arena {
U32 base_pos; // absolute position of base relative to the first linked arena
ArenaFlags flags;
Arena *prev;
S32 checkpoint_level;
};
typedef struct ArenaCheckPoint ArenaCheckPoint;
@@ -45,3 +59,4 @@ void *arena_push(Arena *arena, U32 size, U32 align);
ArenaCheckPoint arena_temp_begin(Arena *arena);
void arena_temp_end(ArenaCheckPoint *checkpoint);
void arena_pop_to(Arena *arena, U32 abs_pos);
void arena_reset(Arena *arena);
+6 -1
View File
@@ -187,7 +187,12 @@ typedef unsigned __int128 U128;
// memory
#define MemSet(ptr, val, len) memset(ptr, val, len)
#define MemoryZero(ptr, len) explicit_bzero(ptr,len)
#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
#define MemoryZero(ptr, len) memset(ptr, 0, len)
// explicity bzero is usually not being intercepted
#else
#define MemoryZero(ptr, len) explicit_bzero(ptr, len)
#endif
#define MemMove(dst, src, len) memmove(dst, src, len)
#define MemCpy(dst, src, len) memcpy(dst, src, len)
#define MemAppend(dst, src, len) mempcpy(dst, src, len)
+4 -2
View File
@@ -24,8 +24,8 @@ static void arena_test_1(void)
arena_params.size = 1024+ARENA_HEADER_SZ;
Arena *arena = arena_alloc_(&arena_params);
arena_dump(arena);
char *ptr = arena_push(arena, 1024, 1);
MemoryZero(ptr, 1024);
char *ptr = arena_push(arena, 512, 1);
MemoryZero(ptr, 512);
printf("Allocated ptr %p\n", ptr);
arena_dump(arena);
ptr = arena_push(arena, 512, 1);
@@ -62,6 +62,7 @@ static void arena_test_2(void)
arena_pop_to(arena, 1088);
arena_dump(arena);
ptr = arena_push(arena, 1, 1);
((U8*)ptr)[1] =1; //OOB
ptr = arena_push(arena, 1, 1);
arena_pop_to(arena, 1089);
arena_dump(arena);
@@ -71,5 +72,6 @@ static void arena_test_2(void)
int main(int argc, char *argv[])
{
arena_test_1();
arena_test_2();
}