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

fix timeout for sessions restart and + usage

Browse Source
This commit is contained in:
vanhauser-thc
2023-06-20 19:58:08 +02:00
parent a0242db421
commit 7b29f2cd24
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
docs/Changelog.md
View File

@ -4,13 +4,16 @@
release of the tool. See README.md for the general instruction manual. release of the tool. See README.md for the general instruction manual.
### Version ++4.08a (dev) ### Version ++4.08a (dev)
- new mutation engine: mutations that favor discovery more paths are prefered - afl-fuzz:
until no new finds for 10 minutes then switching to mutations that favor - new mutation engine: mutations that favor discovery more paths are
triggering crashes. Modes and switch time can be configured wie `-P`. prefered until no new finds for 10 minutes then switching to mutations
- new custom mutator that has the new afl++ engine (so it can easily that favor triggering crashes. Modes and switch time can be configured
incorporated into new custom mutators), and also comes with a standalone with `-P`.
command line tool! See custom_mutators/aflpp/standalone/ - new custom mutator that has the new afl++ engine (so it can easily
- display the state of the fuzzing run in the UI :-) incorporated into new custom mutators), and also comes with a standalone
command line tool! See custom_mutators/aflpp/standalone/
- display the state of the fuzzing run in the UI :-)
- fix timeout setting if '+' is used or a session is restarted
### Version ++4.07c (release) ### Version ++4.07c (release)

14
src/afl-fuzz-stats.c
View File

@ -2303,7 +2303,12 @@ void show_init_stats(afl_state_t *afl) {
stringify_int(IB(0), min_us), stringify_int(IB(1), max_us), stringify_int(IB(0), min_us), stringify_int(IB(1), max_us),
stringify_int(IB(2), avg_us)); stringify_int(IB(2), avg_us));
if (afl->timeout_given != 1) { if (afl->timeout_given == 3) {
ACTF("Applying timeout settings from resumed session (%u ms).",
afl->fsrv.exec_tmout);
} else if (afl->timeout_given != 1) {
/* Figure out the appropriate timeout. The basic idea is: 5x average or /* Figure out the appropriate timeout. The basic idea is: 5x average or
1x max, rounded up to EXEC_TM_ROUND ms and capped at 1 second. 1x max, rounded up to EXEC_TM_ROUND ms and capped at 1 second.
@ -2345,13 +2350,6 @@ void show_init_stats(afl_state_t *afl) {
afl->timeout_given = 1; afl->timeout_given = 1;
} else if (afl->timeout_given == 3) {
ACTF("Applying timeout settings from resumed session (%u ms).",
afl->fsrv.exec_tmout);
} else {
ACTF("-t option specified. We'll use an exec timeout of %u ms.", ACTF("-t option specified. We'll use an exec timeout of %u ms.",
afl->fsrv.exec_tmout); afl->fsrv.exec_tmout);

1
src/afl-fuzz.c
View File

@ -2362,6 +2362,7 @@ int main(int argc, char **argv_orig, char **envp) {
max_ms = afl->queue_buf[entry]->exec_us; max_ms = afl->queue_buf[entry]->exec_us;
afl->fsrv.exec_tmout = max_ms; afl->fsrv.exec_tmout = max_ms;
afl->timeout_given = 1;
} }