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

Merge pull request #379 from arnow117/master

Browse Source 
Fix MOpt implementation flaws
This commit is contained in:
van Hauser
2020-05-27 11:27:11 +02:00
committed by GitHub
parent 434ccf3df4 dab498c3b7
commit cee4b4593b
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/afl-fuzz-one.c
View File

@ -4250,14 +4250,29 @@ pacemaker_fuzzing:
u64 temp_temp_puppet = u64 temp_temp_puppet =
afl->queued_paths + afl->unique_crashes - temp_total_found; afl->queued_paths + afl->unique_crashes - temp_total_found;
afl->total_puppet_find = afl->total_puppet_find + temp_temp_puppet; afl->total_puppet_find = afl->total_puppet_find + temp_temp_puppet;
for (i = 0; i < operator_num; ++i) {
if (MOpt_globals.cycles_v2[i] > MOpt_globals.cycles_v3[i]) { if (MOpt_globals.is_pilot_mode){
MOpt_globals.finds_v2[i] += temp_temp_puppet; for (i = 0; i < operator_num; ++i) {
if (MOpt_globals.cycles_v2[i] > MOpt_globals.cycles_v3[i]) {
MOpt_globals.finds_v2[i] += temp_temp_puppet;
}
} }
} else {
for (i = 0; i < operator_num; i++) {
if (afl->core_operator_cycles_puppet_v2[i] > afl->core_operator_cycles_puppet_v3[i])
afl->core_operator_finds_puppet_v2[i] += temp_temp_puppet;
}
} }
} /* if */ } /* if */
@ -4437,7 +4452,6 @@ pacemaker_fuzzing:
afl->total_pacemaker_time += *MOpt_globals.pTime; afl->total_pacemaker_time += *MOpt_globals.pTime;
*MOpt_globals.pTime = 0; *MOpt_globals.pTime = 0;
afl->temp_puppet_find = afl->total_puppet_find;
new_hit_cnt = afl->queued_paths + afl->unique_crashes; new_hit_cnt = afl->queued_paths + afl->unique_crashes;
if (MOpt_globals.is_pilot_mode) { if (MOpt_globals.is_pilot_mode) {
@ -4448,6 +4462,7 @@ pacemaker_fuzzing:
} }
afl->temp_puppet_find = afl->total_puppet_find;
u64 temp_stage_finds_puppet = 0; u64 temp_stage_finds_puppet = 0;
for (i = 0; i < operator_num; ++i) { for (i = 0; i < operator_num; ++i) {
@ -4530,6 +4545,15 @@ pacemaker_fuzzing:
} else { } else {
for (i = 0; i < operator_num; i++)
{
afl->core_operator_finds_puppet[i] = afl->core_operator_finds_puppet_v2[i];
afl->core_operator_cycles_puppet[i] = afl->core_operator_cycles_puppet_v2[i];
temp_stage_finds_puppet += afl->core_operator_finds_puppet[i];
}
afl->key_module = 2; afl->key_module = 2;
afl->old_hit_count = new_hit_cnt; afl->old_hit_count = new_hit_cnt;