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

new auto map

Browse Source
This commit is contained in:
aflpp
2021-03-11 09:32:22 +01:00
parent adeb0d18b1
commit b7d90a9e31
1 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/afl-fuzz.c
View File

@ -1584,7 +1584,7 @@ int main(int argc, char **argv_orig, char **envp) {
if (!afl->non_instrumented_mode && !afl->fsrv.qemu_mode && if (!afl->non_instrumented_mode && !afl->fsrv.qemu_mode &&
!afl->unicorn_mode) { !afl->unicorn_mode) {
if (map_size <= 8000000&& !afl->non_instrumented_mode && if (map_size <= 8000000 && !afl->non_instrumented_mode &&
!afl->fsrv.qemu_mode && !afl->unicorn_mode) { !afl->fsrv.qemu_mode && !afl->unicorn_mode) {
afl->fsrv.map_size = 8000000; // dummy temporary value afl->fsrv.map_size = 8000000; // dummy temporary value
@ -1595,11 +1595,10 @@ int main(int argc, char **argv_orig, char **envp) {
u32 new_map_size = afl_fsrv_get_mapsize( u32 new_map_size = afl_fsrv_get_mapsize(
&afl->fsrv, afl->argv, &afl->stop_soon, afl->afl_env.afl_debug_child); &afl->fsrv, afl->argv, &afl->stop_soon, afl->afl_env.afl_debug_child);
if (new_map_size && new_map_size != map_size) {
// only reinitialize when it makes sense // only reinitialize when it makes sense
if (map_size < new_map_size || if (map_size < new_map_size ||
(new_map_size > map_size && new_map_size - map_size > MAP_SIZE)) { (!afl->cmplog_binary && new_map_size < map_size &&
map_size - new_map_size > MAP_SIZE)) {
OKF("Re-initializing maps to %u bytes", new_map_size); OKF("Re-initializing maps to %u bytes", new_map_size);
@ -1624,18 +1623,14 @@ int main(int argc, char **argv_orig, char **envp) {
afl_fsrv_start(&afl->fsrv, afl->argv, &afl->stop_soon, afl_fsrv_start(&afl->fsrv, afl->argv, &afl->stop_soon,
afl->afl_env.afl_debug_child); afl->afl_env.afl_debug_child);
}
map_size = new_map_size; map_size = new_map_size;
} else { }
afl->fsrv.map_size = map_size; afl->fsrv.map_size = map_size;
} }
}
if (afl->cmplog_binary) { if (afl->cmplog_binary) {
ACTF("Spawning cmplog forkserver"); ACTF("Spawning cmplog forkserver");
@ -1658,10 +1653,9 @@ int main(int argc, char **argv_orig, char **envp) {
afl_fsrv_get_mapsize(&afl->cmplog_fsrv, afl->argv, &afl->stop_soon, afl_fsrv_get_mapsize(&afl->cmplog_fsrv, afl->argv, &afl->stop_soon,
afl->afl_env.afl_debug_child); afl->afl_env.afl_debug_child);
if (new_map_size && new_map_size != map_size) {
// only reinitialize when it needs to be larger // only reinitialize when it needs to be larger
if (map_size < new_map_size) { if (map_size < new_map_size ||
(new_map_size < map_size && map_size - new_map_size > MAP_SIZE)) {
OKF("Re-initializing maps to %u bytes due cmplog", new_map_size); OKF("Re-initializing maps to %u bytes due cmplog", new_map_size);
@ -1691,8 +1685,6 @@ int main(int argc, char **argv_orig, char **envp) {
afl_fsrv_start(&afl->cmplog_fsrv, afl->argv, &afl->stop_soon, afl_fsrv_start(&afl->cmplog_fsrv, afl->argv, &afl->stop_soon,
afl->afl_env.afl_debug_child); afl->afl_env.afl_debug_child);
}
map_size = new_map_size; map_size = new_map_size;
} }