Added AFL_AUTORESUME option
MODIFY
docs/Changelog.md
docs/Changelog.md
@@ -13,6 +13,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- qemu_mode now uses solely the internal capstone version to fix builds
on modern Linux distributions
- more tools get environment variable usage info in the help output
+ - AFL_AUTORESUME will resume execution without the need to specify `-i -`
### Version ++2.62c (release):

MODIFY
docs/env_variables.md
docs/env_variables.md
@@ -265,6 +265,10 @@ checks or alter some of the more exotic semantics of the tool:
- Setting AFL_NO_CPU_RED will not display very high cpu usages in red color.
+ - Setting AFL_AUTORESUME will resume a fuzz run (same as providing `-i -`)
+ for an existing out folder, even if a different `-i` was provided.
+ Without this setting, afl-fuzz will refuse execution for a long-fuzzed out dir.
+
- Outdated environment variables that are that not supported anymore:
AFL_DEFER_FORKSRV
AFL_PERSISTENT

MODIFY
include/afl-fuzz.h
include/afl-fuzz.h
@@ -636,7 +636,6 @@ u32 find_start_position(void);
void find_timeout(void);
double get_runnable_processes(void);
void nuke_resume_dir(void);
-void maybe_delete_out_dir(void);
void setup_dirs_fds(void);
void setup_cmdline_file(char**);
void setup_stdio_file(void);

MODIFY
include/envs.h
include/envs.h
const char *afl_environment_variables[] = {
"AFL_ALIGNED_ALLOC", "AFL_ALLOW_TMP", "AFL_ANALYZE_HEX", "AFL_AS",
+ "AFL_AUTORESUME",
"AFL_AS_FORCE_INSTRUMENT", "AFL_BENCH_JUST_ONE", "AFL_BENCH_UNTIL_CRASH",
"AFL_CAL_FAST", "AFL_CC", "AFL_CMIN_ALLOW_ANY", "AFL_CMIN_CRASHES_ONLY",
"AFL_CODE_END", "AFL_CODE_START", "AFL_COMPCOV_BINNAME",

MODIFY
src/afl-fuzz-init.c
src/afl-fuzz-init.c
@@ -894,7 +894,7 @@ void find_timeout(void) {
}
-/* A helper function for maybe_delete_out_dir(), deleting all prefixed
+/* A helper function for handle_existing_out_dir(), deleting all prefixed
files in a directory. */
static u8 delete_files(u8* path, u8* prefix) {
@@ -1018,9 +1018,10 @@ dir_cleanup_failed:
}
/* Delete fuzzer output directory if we recognize it as ours, if the fuzzer
- is not currently running, and if the last run time isn't too great. */
+ is not currently running, and if the last run time isn't too great.
+ Resume fuzzing if `-` is set as in_dir or if AFL_AUTORESUME is set */
-void maybe_delete_out_dir(void) {
+static void handle_existing_out_dir(void) {
FILE* f;
u8* fn = alloc_printf("%s/fuzzer_stats", out_dir);
@@ -1063,6 +1064,15 @@ void maybe_delete_out_dir(void) {
fclose(f);
+ /* Autoresume treats a normal run as in_place_resume if a valid out dir already exists */
+
+ if (getenv("AFL_AUTORESUME")) {
+
+ OKF("Detected prior run with AFL_AUTORESUME set. Resuming.");
+ in_place_resume = 1;
+
+ }
+
/* Let's see how much work is at stake. */
if (!in_place_resume && last_update - start_time2 > OUTPUT_GRACE * 60) {
@@ -1079,7 +1089,7 @@ void maybe_delete_out_dir(void) {
" or specify a different output location for this job. To resume "
"the old\n"
" session, put '-' as the input directory in the command line "
- "('-i -') and\n"
+ "('-i -') or set the AFL_AUTORESUME=1 env variable and\n"
" try again.\n",
OUTPUT_GRACE);
@@ -1306,7 +1316,7 @@ void setup_dirs_fds(void) {
if (errno != EEXIST) PFATAL("Unable to create '%s'", out_dir);
- maybe_delete_out_dir();
+ handle_existing_out_dir();
} else {

Added AFL_AUTORESUME option