diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/afl-fuzz-one.c | 2 | ||||
| -rw-r--r-- | src/afl-fuzz-redqueen.c | 133 |
2 files changed, 113 insertions, 22 deletions
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index c1f3f9ac..18376556 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -531,7 +531,7 @@ u8 fuzz_one_original(char** argv) { } - if (cmplog_mode) { + if (cmplog_mode && !queue_cur->fully_colorized) { if (input_to_state_stage(argv, in_buf, out_buf, len, queue_cur->exec_cksum)) goto abandon_entry; diff --git a/src/afl-fuzz-redqueen.c b/src/afl-fuzz-redqueen.c index 4f5d69f7..b09a977f 100644 --- a/src/afl-fuzz-redqueen.c +++ b/src/afl-fuzz-redqueen.c @@ -145,6 +145,9 @@ u8 colorization(u8* buf, u32 len, u32 exec_cksum) { --stage_cur; } + + if (stage_cur) + queue_cur->fully_colorized = 1; new_hit_cnt = queued_paths + unique_crashes; stage_finds[STAGE_COLORIZATION] += new_hit_cnt - orig_hit_cnt; @@ -204,7 +207,7 @@ checksum_fail: ///// Input to State replacement -u8 its_fuzz(u32 idx, u32 size, u8* buf, u32 len, u8* status) { +u8 its_fuzz(u8* buf, u32 len, u8* status) { u64 orig_hit_cnt, new_hit_cnt; @@ -214,18 +217,11 @@ u8 its_fuzz(u32 idx, u32 size, u8* buf, u32 len, u8* status) { new_hit_cnt = queued_paths + unique_crashes; - if (unlikely(new_hit_cnt != orig_hit_cnt)) { - + if (unlikely(new_hit_cnt != orig_hit_cnt)) *status = 1; - - } else { - - if (size >= MIN_AUTO_EXTRA && size <= MAX_AUTO_EXTRA) - maybe_add_auto(&buf[idx], size); + else *status = 2; - } - return 0; } @@ -251,7 +247,7 @@ u8 cmp_extend_encoding(struct cmp_header* h, u64 pattern, u64 repl, u32 idx, if (its_len >= 8 && *buf_64 == pattern && *o_buf_64 == pattern) { *buf_64 = repl; - if (unlikely(its_fuzz(idx, 8, buf, len, status))) return 1; + if (unlikely(its_fuzz(buf, len, status))) return 1; *buf_64 = pattern; } @@ -269,7 +265,7 @@ u8 cmp_extend_encoding(struct cmp_header* h, u64 pattern, u64 repl, u32 idx, if (its_len >= 4 && *buf_32 == (u32)pattern && *o_buf_32 == (u32)pattern) { *buf_32 = (u32)repl; - if (unlikely(its_fuzz(idx, 4, buf, len, status))) return 1; + if (unlikely(its_fuzz(buf, len, status))) return 1; *buf_32 = pattern; } @@ -287,7 +283,7 @@ u8 cmp_extend_encoding(struct cmp_header* h, u64 pattern, u64 repl, u32 idx, if (its_len >= 2 && *buf_16 == (u16)pattern && *o_buf_16 == (u16)pattern) { *buf_16 = (u16)repl; - if (unlikely(its_fuzz(idx, 2, buf, len, status))) return 1; + if (unlikely(its_fuzz(buf, len, status))) return 1; *buf_16 = (u16)pattern; } @@ -305,7 +301,7 @@ u8 cmp_extend_encoding(struct cmp_header* h, u64 pattern, u64 repl, u32 idx, if (its_len >= 2 && *buf_8 == (u8)pattern && *o_buf_8 == (u8)pattern) { *buf_8 = (u8)repl; - if (unlikely(its_fuzz(idx, 1, buf, len, status))) + if (unlikely(its_fuzz(buf, len, status))) return 1; *buf_16 = (u16)pattern; @@ -417,12 +413,97 @@ u8 cmp_fuzz(u32 key, u8* orig_buf, u8* buf, u32 len) { } +u8 rtn_extend_encoding(struct cmp_header* h, u8* pattern, u8* repl, u32 idx, + u8* orig_buf, u8* buf, u32 len, u8* status) { + + u32 i; + u32 its_len = MIN(32, len - idx); + + u8 save[32]; + memcpy(save, &buf[idx], its_len); + + *status = 0; + + for (i = 0; i < its_len; ++i) { + + if (pattern[idx + i] != orig_buf[idx + i] || *status == 1) + break; + + buf[idx +i] = repl[idx + i]; + if (unlikely(its_fuzz(buf, len, status))) return 1; + + } + + memcpy(&buf[idx], save, i); + return 0; + +} + +u8 rtn_fuzz(u32 key, u8* orig_buf, u8* buf, u32 len) { + + struct cmp_header* h = &cmp_map->headers[key]; + u32 i, j, idx; + + u32 loggeds = h->hits; + if (h->hits > CMP_MAP_RTN_H) loggeds = CMP_MAP_RTN_H; + + u8 status; + // opt not in the paper + u32 fails = 0; + + for (i = 0; i < loggeds; ++i) { + + struct cmpfn_operands* o = &((struct cmpfn_operands*)cmp_map->log[key])[i]; + + // opt not in the paper + for (j = 0; j < i; ++j) + if (!memcmp(&((struct cmpfn_operands*)cmp_map->log[key])[j], o, sizeof(struct cmpfn_operands))) + goto rtn_fuzz_next_iter; + + for (idx = 0; idx < len && fails < 8; ++idx) { + + if (unlikely(rtn_extend_encoding(h, o->v0, o->v1, idx, orig_buf, buf, len, + &status))) + return 1; + if (status == 2) + ++fails; + else if (status == 1) + break; + + if (unlikely(rtn_extend_encoding(h, o->v1, o->v0, idx, orig_buf, buf, len, + &status))) + return 1; + if (status == 2) + ++fails; + else if (status == 1) + break; + + } + + // If failed, add to dictionary + if (fails == 8) { + + maybe_add_auto(o->v0, SHAPE_BYTES(h->shape)); + maybe_add_auto(o->v1, SHAPE_BYTES(h->shape)); + + } + + rtn_fuzz_next_iter: + stage_cur++; + + } + + return 0; + +} + ///// Input to State stage // queue_cur->exec_cksum u8 input_to_state_stage(char** argv, u8* orig_buf, u8* buf, u32 len, u32 exec_cksum) { + u8 r = 1; its_argv = argv; if (unlikely(colorization(buf, len, exec_cksum))) return 1; @@ -445,27 +526,37 @@ u8 input_to_state_stage(char** argv, u8* orig_buf, u8* buf, u32 len, for (k = 0; k < CMP_MAP_W; ++k) { if (!cmp_map->headers[k].hits) continue; - if (cmp_map->headers[k].hits > CMP_MAP_H) - stage_max += CMP_MAP_H; + if (cmp_map->headers[k].type == CMP_TYPE_INS) + stage_max += MIN(cmp_map->headers[k].hits, CMP_MAP_H); else - stage_max += cmp_map->headers[k].hits; + stage_max += MIN(cmp_map->headers[k].hits, CMP_MAP_RTN_H); } - + for (k = 0; k < CMP_MAP_W; ++k) { if (!cmp_map->headers[k].hits) continue; - cmp_fuzz(k, orig_buf, buf, len); + + if (cmp_map->headers[k].type == CMP_TYPE_INS) { + if (unlikely(cmp_fuzz(k, orig_buf, buf, len))) + goto exit_its; + } else { + if (unlikely(rtn_fuzz(k, orig_buf, buf, len))) + goto exit_its; + } } - memcpy(orig_buf, buf, len); + r = 0; +exit_its: + memcpy(orig_buf, buf, len); + new_hit_cnt = queued_paths + unique_crashes; stage_finds[STAGE_ITS] += new_hit_cnt - orig_hit_cnt; stage_cycles[STAGE_ITS] += total_execs - orig_execs; - return 0; + return r; } |