Integrate address sanitizer
This commit is contained in:
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -x
|
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
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ Arena *arena_alloc_(const ArenaParams *params)
|
|||||||
|
|
||||||
// Note: only backend now is malloc
|
// Note: only backend now is malloc
|
||||||
void *base = memory_allocate(params->size);
|
void *base = memory_allocate(params->size);
|
||||||
|
//((U8*)base)[1023+ARENA_HEADER_SZ] = 1;
|
||||||
|
|
||||||
Assert(base != NULL);
|
Assert(base != NULL);
|
||||||
|
|
||||||
Arena *arena = (Arena *)base;
|
Arena *arena = (Arena *)base;
|
||||||
@@ -37,6 +39,7 @@ Arena *arena_alloc_(const ArenaParams *params)
|
|||||||
arena->prev = NULL;
|
arena->prev = NULL;
|
||||||
arena->checkpoint_level = 0;
|
arena->checkpoint_level = 0;
|
||||||
|
|
||||||
|
ASAN_POISON_MEMORY_REGION(&arena->base[arena->pos], arena_available(arena));
|
||||||
return arena;
|
return arena;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,6 +86,7 @@ void *arena_push(Arena *arena, U32 size, U32 align)
|
|||||||
U8 *mem = ¤t->base[start_pos];
|
U8 *mem = ¤t->base[start_pos];
|
||||||
current->pos = end_pos;
|
current->pos = end_pos;
|
||||||
|
|
||||||
|
ASAN_UNPOISON_MEMORY_REGION(mem, size);
|
||||||
return mem;
|
return mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,6 +98,7 @@ void arena_pop_to(Arena *arena, U32 abs_pos)
|
|||||||
Arena *prev = current->prev;
|
Arena *prev = current->prev;
|
||||||
|
|
||||||
if (current->base_pos >= abs_pos) {
|
if (current->base_pos >= abs_pos) {
|
||||||
|
ASAN_UNPOISON_MEMORY_REGION(current->base, current->size);
|
||||||
memory_release(current->base);
|
memory_release(current->base);
|
||||||
arena->current = prev;
|
arena->current = prev;
|
||||||
} else {
|
} else {
|
||||||
@@ -102,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
|
// is the right thing . shouldn't be able to pop to larger than what's already commited
|
||||||
Assert(new_pos <= current->size);
|
Assert(new_pos <= current->size);
|
||||||
current->pos = new_pos;
|
current->pos = new_pos;
|
||||||
|
ASAN_POISON_MEMORY_REGION(¤t->base[current->pos], arena_available(arena));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+13
@@ -1,6 +1,19 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "base_core.h"
|
#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 U32 ArenaFlags;
|
||||||
|
|
||||||
typedef struct ArenaParams ArenaParams;
|
typedef struct ArenaParams ArenaParams;
|
||||||
|
|||||||
@@ -187,7 +187,12 @@ typedef unsigned __int128 U128;
|
|||||||
|
|
||||||
// memory
|
// memory
|
||||||
#define MemSet(ptr, val, len) memset(ptr, val, len)
|
#define MemSet(ptr, val, len) memset(ptr, val, 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)
|
#define MemoryZero(ptr, len) explicit_bzero(ptr, len)
|
||||||
|
#endif
|
||||||
#define MemMove(dst, src, len) memmove(dst, src, len)
|
#define MemMove(dst, src, len) memmove(dst, src, len)
|
||||||
#define MemCpy(dst, src, len) memcpy(dst, src, len)
|
#define MemCpy(dst, src, len) memcpy(dst, src, len)
|
||||||
#define MemAppend(dst, src, len) mempcpy(dst, src, len)
|
#define MemAppend(dst, src, len) mempcpy(dst, src, len)
|
||||||
|
|||||||
+4
-2
@@ -24,8 +24,8 @@ static void arena_test_1(void)
|
|||||||
arena_params.size = 1024+ARENA_HEADER_SZ;
|
arena_params.size = 1024+ARENA_HEADER_SZ;
|
||||||
Arena *arena = arena_alloc_(&arena_params);
|
Arena *arena = arena_alloc_(&arena_params);
|
||||||
arena_dump(arena);
|
arena_dump(arena);
|
||||||
char *ptr = arena_push(arena, 1024, 1);
|
char *ptr = arena_push(arena, 512, 1);
|
||||||
MemoryZero(ptr, 1024);
|
MemoryZero(ptr, 512);
|
||||||
printf("Allocated ptr %p\n", ptr);
|
printf("Allocated ptr %p\n", ptr);
|
||||||
arena_dump(arena);
|
arena_dump(arena);
|
||||||
ptr = arena_push(arena, 512, 1);
|
ptr = arena_push(arena, 512, 1);
|
||||||
@@ -62,6 +62,7 @@ static void arena_test_2(void)
|
|||||||
arena_pop_to(arena, 1088);
|
arena_pop_to(arena, 1088);
|
||||||
arena_dump(arena);
|
arena_dump(arena);
|
||||||
ptr = arena_push(arena, 1, 1);
|
ptr = arena_push(arena, 1, 1);
|
||||||
|
((U8*)ptr)[1] =1; //OOB
|
||||||
ptr = arena_push(arena, 1, 1);
|
ptr = arena_push(arena, 1, 1);
|
||||||
arena_pop_to(arena, 1089);
|
arena_pop_to(arena, 1089);
|
||||||
arena_dump(arena);
|
arena_dump(arena);
|
||||||
@@ -71,5 +72,6 @@ static void arena_test_2(void)
|
|||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
arena_test_1();
|
||||||
arena_test_2();
|
arena_test_2();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user