ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-10 09:11:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

honor AFL_MAP_SIZE well outside of afl++

Browse Source
This commit is contained in:
vanhauser-thc 2022-06-08 10:56:11 +02:00
parent 683dcc4710
commit 83f32c5248
4 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
instrumentation/afl-compiler-rt.o.c
View File

@ -327,6 +327,31 @@ static void __afl_map_shm(void) {
}
if (!id_str) {
u32 val = 0;
u8 *ptr;
if ((ptr = getenv("AFL_MAP_SIZE")) != NULL) val = atoi(ptr);
if (val > MAP_INITIAL_SIZE) {
__afl_map_size = val;
__afl_final_loc = val;
__afl_area_ptr_dummy = malloc(__afl_map_size);
if (!__afl_area_ptr_dummy) {
fprintf(stderr,
"Error: AFL++ could not aquire %u bytes of memory, exiting!\n",
__afl_map_size);
exit(-1);
}
}
}
/* If we're running under AFL, attach to the appropriate region, replacing the
early-stage __afl_area_initial region that is needed to allow some really
hacky .init code to work correctly in projects such as OpenSSL. */
@ -465,7 +490,9 @@ static void __afl_map_shm(void) {
}
} else if (_is_sancov && __afl_area_ptr != __afl_area_initial) {
} else if (_is_sancov && __afl_area_ptr != __afl_area_initial &&
__afl_area_ptr != __afl_area_ptr_dummy) {
free(__afl_area_ptr);
__afl_area_ptr = NULL;
@ -487,7 +514,7 @@ static void __afl_map_shm(void) {
fprintf(stderr,
"DEBUG: (2) id_str %s, __afl_area_ptr %p, __afl_area_initial %p, "
"__afl_area_ptr_dummy %p, __afl_map_addr 0x%llx, MAP_SIZE "
"%u, __afl_final_loc %u, __afl_map_size %u,"
"%u, __afl_final_loc %u, __afl_map_size %u, "
"max_size_forkserver %u/0x%x\n",
id_str == NULL ? "<null>" : id_str, __afl_area_ptr,
__afl_area_initial, __afl_area_ptr_dummy, __afl_map_addr, MAP_SIZE,

6
src/afl-fuzz-run.c
View File

@ -130,11 +130,7 @@ write_to_testcase(afl_state_t *afl, void **mem, u32 len, u32 fix) {
}
if (new_mem != *mem) {
*mem = new_mem;
}
if (new_mem != *mem) { *mem = new_mem; }
/* everything as planned. use the potentially new data. */
afl_fsrv_write_to_testcase(&afl->fsrv, *mem, new_size);

13
src/afl-fuzz-state.c
View File

@ -526,11 +526,18 @@ void read_afl_environment(afl_state_t *afl, char **envp) {
int time = atoi((u8 *)get_afl_env(afl_environment_variables[i]));
if (time > 0) {
afl->sync_time = time * (60 * 1000LL);
afl->sync_time = time * (60 * 1000LL);
} else {
WARNF("incorrect value for AFL_SYNC_TIME environment variable, "
"used default value %lld instead.", afl->sync_time / 60 / 1000);
WARNF(
"incorrect value for AFL_SYNC_TIME environment variable, "
"used default value %lld instead.",
afl->sync_time / 60 / 1000);
}
}
} else {

1
utils/libdislocator/libdislocator.so.c
View File

@ -526,6 +526,7 @@ size_t malloc_good_size(size_t len) {
return (len & ~(ALLOC_ALIGN_SIZE - 1)) + ALLOC_ALIGN_SIZE;
}
#endif
__attribute__((constructor)) void __dislocator_init(void) {