ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-18 12:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

important bugfix for large covmaps

Browse Source
This commit is contained in:
van Hauser
2020-08-15 18:14:44 +02:00
parent 0a251f93e0
commit 73a629d6f2
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
llvm_mode/afl-llvm-rt.o.c
View File

@ -107,6 +107,10 @@ struct cmp_map *__afl_cmp_map;
static u8 is_persistent; static u8 is_persistent;
/* Are we in sancov mode? */
static u8 _is_sancov;
/* Error reporting to forkserver controller */ /* Error reporting to forkserver controller */
void send_forkserver_error(int error) { void send_forkserver_error(int error) {
@ -190,19 +194,10 @@ static void __afl_map_shm(void) {
if (__afl_final_loc) { if (__afl_final_loc) {
if (__afl_area_ptr && __afl_final_loc &&
__afl_final_loc > MAP_INITIAL_SIZE &&
__afl_area_ptr != __afl_area_initial) {
munmap(__afl_area_ptr, __afl_final_loc);
__afl_area_ptr = __afl_area_initial;
}
if (__afl_final_loc % 8) if (__afl_final_loc % 8)
__afl_final_loc = (((__afl_final_loc + 7) >> 3) << 3); __afl_final_loc = (((__afl_final_loc + 7) >> 3) << 3);
__afl_map_size = __afl_final_loc; __afl_map_size = __afl_final_loc;
if (__afl_final_loc > MAP_SIZE) { if (__afl_final_loc > MAP_SIZE) {
char *ptr; char *ptr;
@ -212,10 +207,12 @@ static void __afl_map_shm(void) {
if (__afl_final_loc > FS_OPT_MAX_MAPSIZE) { if (__afl_final_loc > FS_OPT_MAX_MAPSIZE) {
fprintf(stderr, if (!getenv("AFL_QUIET"))
"Error: AFL++ tools *require* to set AFL_MAP_SIZE to %u to " fprintf(stderr,
"be able to run this instrumented program!\n", "Error: AFL++ tools *require* to set AFL_MAP_SIZE to %u "
__afl_final_loc); "to be able to run this instrumented program!\n",
__afl_final_loc);
if (id_str) { if (id_str) {
send_forkserver_error(FS_ERROR_MAP_SIZE); send_forkserver_error(FS_ERROR_MAP_SIZE);
@ -225,10 +222,11 @@ static void __afl_map_shm(void) {
} else { } else {
fprintf(stderr, if (!getenv("AFL_QUIET"))
"Warning: AFL++ tools will need to set AFL_MAP_SIZE to %u to " fprintf(stderr,
"be able to run this instrumented program!\n", "Warning: AFL++ tools will need to set AFL_MAP_SIZE to %u "
__afl_final_loc); "to be able to run this instrumented program!\n",
__afl_final_loc);
} }
@ -251,6 +249,13 @@ static void __afl_map_shm(void) {
if (id_str) { if (id_str) {
if (__afl_area_ptr && __afl_area_ptr != __afl_area_initial) {
free(__afl_area_ptr);
__afl_area_ptr = __afl_area_initial;
}
#ifdef USEMMAP #ifdef USEMMAP
const char * shm_file_path = id_str; const char * shm_file_path = id_str;
int shm_fd = -1; int shm_fd = -1;
@ -332,6 +337,14 @@ static void __afl_map_shm(void) {
} }
} else if (_is_sancov && __afl_area_ptr != __afl_area_initial) {
free(__afl_area_ptr);
__afl_area_ptr = NULL;
if (__afl_final_loc > MAP_INITIAL_SIZE)
__afl_area_ptr = malloc(__afl_final_loc);
if (!__afl_area_ptr) __afl_area_ptr = __afl_area_initial;
} }
id_str = getenv(CMPLOG_SHM_ENV_VAR); id_str = getenv(CMPLOG_SHM_ENV_VAR);
@ -904,8 +917,7 @@ __attribute__((constructor(0))) void __afl_auto_first(void) {
u8 *ptr; u8 *ptr;
u32 get_size = __afl_final_loc ? __afl_final_loc : 1024000; u32 get_size = __afl_final_loc ? __afl_final_loc : 1024000;
ptr = (u8 *)mmap(NULL, __afl_final_loc, PROT_READ | PROT_WRITE, MAP_PRIVATE, ptr = (u8 *)malloc(get_size);
-1, 0);
if (ptr && (ssize_t)ptr != -1) { __afl_area_ptr = ptr; } if (ptr && (ssize_t)ptr != -1) { __afl_area_ptr = ptr; }
} }
@ -974,6 +986,8 @@ void __sanitizer_cov_trace_pc_guard_init(uint32_t *start, uint32_t *stop) {
u32 inst_ratio = 100; u32 inst_ratio = 100;
char *x; char *x;
_is_sancov = 1;
if (getenv("AFL_DEBUG")) { if (getenv("AFL_DEBUG")) {
fprintf(stderr, "Running __sanitizer_cov_trace_pc_guard_init: %p-%p\n", fprintf(stderr, "Running __sanitizer_cov_trace_pc_guard_init: %p-%p\n",