fix exploit, mmopt and rare schedule

This commit is contained in:
van Hauser
2020-09-19 15:13:15 +02:00
parent 44c0dc6d96
commit 7ff9800804
3 changed files with 9 additions and 9 deletions

View File

@ -243,13 +243,13 @@ enum {
enum { enum {
/* 00 */ EXPLORE, /* AFL default, Exploration-based constant schedule */ /* 00 */ EXPLORE, /* AFL default, Exploration-based constant schedule */
/* 01 */ EXPLOIT, /* AFL's exploitation-based const. */ /* 01 */ MMOPT, /* Modified MOPT schedule */
/* 02 */ FAST, /* Exponential schedule */ /* 02 */ EXPLOIT, /* AFL's exploitation-based const. */
/* 03 */ COE, /* Cut-Off Exponential schedule */ /* 03 */ FAST, /* Exponential schedule */
/* 04 */ LIN, /* Linear schedule */ /* 04 */ COE, /* Cut-Off Exponential schedule */
/* 05 */ QUAD, /* Quadratic schedule */ /* 05 */ LIN, /* Linear schedule */
/* 06 */ RARE, /* Rare edges */ /* 06 */ QUAD, /* Quadratic schedule */
/* 07 */ MMOPT, /* Modified MOPT schedule */ /* 07 */ RARE, /* Rare edges */
/* 08 */ SEEK, /* EXPLORE that ignores timings */ /* 08 */ SEEK, /* EXPLORE that ignores timings */
POWER_SCHEDULES_NUM POWER_SCHEDULES_NUM

View File

@ -710,7 +710,7 @@ u32 calculate_score(afl_state_t *afl, struct queue_entry *q) {
} }
if (unlikely(afl->schedule >= FAST && afl->schedule <= RARE)) { if (unlikely(afl->schedule >= EXPLOIT && afl->schedule <= QUAD)) {
if (factor > MAX_FACTOR) { factor = MAX_FACTOR; } if (factor > MAX_FACTOR) { factor = MAX_FACTOR; }
perf_score *= factor / POWER_BETA; perf_score *= factor / POWER_BETA;

View File

@ -1366,7 +1366,7 @@ int main(int argc, char **argv_orig, char **envp) {
afl->expand_havoc = 2; afl->expand_havoc = 2;
break; break;
case 2: case 2:
if (!have_p) afl->schedule = EXPLOIT; //if (!have_p) afl->schedule = EXPLOIT;
afl->expand_havoc = 3; afl->expand_havoc = 3;
break; break;
case 3: case 3: