This is an archive of the discontinued LLVM Phabricator instance.

Differential D42325

[AFL] Allow opting out of defered forkserver mode.
AbandonedPublic

Authored by metzman on Jan 19 2018, 4:36 PM.

Details

Reviewers
None
Summary

Dont use defered forkserver mode when DONT_DEFER_FORKSRV is defined.

Diff Detail

Revision Contents

PathSize
lib/
fuzzer/
afl/
11 lines

Diff 130719

lib/fuzzer/afl/afl_driver.cpp

Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Lines
__attribute__((weak)) int LLVMFuzzerInitialize(int *argc, char ***argv); __attribute__((weak)) int LLVMFuzzerInitialize(int *argc, char ***argv);
} }
// Notify AFL about persistent mode. // Notify AFL about persistent mode.
static volatile char AFL_PERSISTENT[] = "##SIG_AFL_PERSISTENT##"; static volatile char AFL_PERSISTENT[] = "##SIG_AFL_PERSISTENT##";
extern "C" int __afl_persistent_loop(unsigned int); extern "C" int __afl_persistent_loop(unsigned int);
static volatile char suppress_warning2 = AFL_PERSISTENT[0]; static volatile char suppress_warning2 = AFL_PERSISTENT[0];
// Notify AFL about deferred forkserver. // Notify AFL about deferred forkserver unless told not to.
static volatile char AFL_DEFER_FORKSVR[] = "##SIG_AFL_DEFER_FORKSRV##"; #ifndef DONT_DEFER_FORKSRV
static volatile char AFL_DEFER_FORKSRV[] = "##SIG_AFL_DEFER_FORKSRV##";
extern "C" void __afl_manual_init(); extern "C" void __afl_manual_init();
static volatile char suppress_warning1 = AFL_DEFER_FORKSVR[0]; static volatile char suppress_warning1 = AFL_DEFER_FORKSRV[0];
#endif
// Input buffer. // Input buffer.
static const size_t kMaxAflInputSize = 1 << 20; static const size_t kMaxAflInputSize = 1 << 20;
static uint8_t AflInputBuf[kMaxAflInputSize]; static uint8_t AflInputBuf[kMaxAflInputSize];
// Variables we need for writing to the extra stats file. // Variables we need for writing to the extra stats file.
static FILE *extra_stats_file = NULL; static FILE *extra_stats_file = NULL;
static uint32_t previous_peak_rss = 0; static uint32_t previous_peak_rss = 0;
▲ Show 20 Lines • Show All 173 Lines • ▼ Show 20 Lines fprintf(stderr,
argv[0], argv[0], argv[0]); argv[0], argv[0], argv[0]);
if (LLVMFuzzerInitialize) if (LLVMFuzzerInitialize)
LLVMFuzzerInitialize(&argc, &argv); LLVMFuzzerInitialize(&argc, &argv);
// Do any other expensive one-time initialization here. // Do any other expensive one-time initialization here.
maybe_duplicate_stderr(); maybe_duplicate_stderr();
maybe_initialize_extra_stats(); maybe_initialize_extra_stats();
// We must manually init when using defered forkserver.
#ifndef DONT_DEFER_FORKSRV
__afl_manual_init(); __afl_manual_init();
#endif
int N = 1000; int N = 1000;
if (argc == 2 && argv[1][0] == '-') if (argc == 2 && argv[1][0] == '-')
N = atoi(argv[1] + 1); N = atoi(argv[1] + 1);
else if(argc == 2 && (N = atoi(argv[1])) > 0) else if(argc == 2 && (N = atoi(argv[1])) > 0)
fprintf(stderr, "WARNING: using the deprecated call style `%s %d`\n", fprintf(stderr, "WARNING: using the deprecated call style `%s %d`\n",
argv[0], N); argv[0], N);
else if (argc > 1) else if (argc > 1)
Show All 40 Lines