-m none is the default now

This commit is contained in:
van Hauser
2020-10-09 23:23:44 +02:00
parent fd4a2dfec2
commit 125f8b6ba7
5 changed files with 13 additions and 19 deletions

View File

@ -14,6 +14,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- all compilers combined to afl-cc which emulates the previous ones - all compilers combined to afl-cc which emulates the previous ones
- afl-llvm/gcc-rt.o merged into afl-compiler-rt.o - afl-llvm/gcc-rt.o merged into afl-compiler-rt.o
- afl-fuzz - afl-fuzz
- memory limits are now disabled by default, set them with -m if required
- Marcel Boehme submitted a patch that improves all AFFast schedules :) - Marcel Boehme submitted a patch that improves all AFFast schedules :)
- reading testcases from -i now descends into subdirectories - reading testcases from -i now descends into subdirectories
- allow up to 4 -x command line options - allow up to 4 -x command line options

View File

@ -37,7 +37,8 @@ unsigned char fuzz_buf[1024000];
#define __AFL_FUZZ_TESTCASE_LEN fuzz_len #define __AFL_FUZZ_TESTCASE_LEN fuzz_len
#define __AFL_FUZZ_TESTCASE_BUF fuzz_buf #define __AFL_FUZZ_TESTCASE_BUF fuzz_buf
#define __AFL_FUZZ_INIT() void sync(void); #define __AFL_FUZZ_INIT() void sync(void);
#define __AFL_LOOP(x) ((fuzz_len = read(0, fuzz_buf, sizeof(fuzz_buf))) > 0 ? 1 : 0) #define __AFL_LOOP(x) \
((fuzz_len = read(0, fuzz_buf, sizeof(fuzz_buf))) > 0 ? 1 : 0)
#define __AFL_INIT() sync() #define __AFL_INIT() sync()
#endif #endif

View File

@ -66,25 +66,17 @@
#define WORD_SIZE_64 1 #define WORD_SIZE_64 1
#endif #endif
/* Default memory limit for child process (MB): */ /* Default memory limit for child process (MB) 0 = disabled : */
#ifndef __NetBSD__ #define MEM_LIMIT 0
#ifndef WORD_SIZE_64
#define MEM_LIMIT 50
#else
#define MEM_LIMIT 75
#endif /* ^!WORD_SIZE_64 */
#else /* NetBSD's kernel needs more space for stack, see discussion for issue \
#165 */
#define MEM_LIMIT 250
#endif
/* Default memory limit when running in QEMU mode (MB): */
#define MEM_LIMIT_QEMU 250 /* Default memory limit when running in QEMU mode (MB) 0 = disabled : */
/* Default memory limit when running in Unicorn mode (MB): */ #define MEM_LIMIT_QEMU 0
#define MEM_LIMIT_UNICORN 250 /* Default memory limit when running in Unicorn mode (MB) 0 = disabled : */
#define MEM_LIMIT_UNICORN 0
/* Number of calibration cycles per every new test case (and for test /* Number of calibration cycles per every new test case (and for test
cases that show variable behavior): */ cases that show variable behavior): */

View File

@ -87,7 +87,7 @@ void afl_state_init(afl_state_t *afl, uint32_t map_size) {
afl->w_end = 0.3; afl->w_end = 0.3;
afl->g_max = 5000; afl->g_max = 5000;
afl->period_pilot_tmp = 5000.0; afl->period_pilot_tmp = 5000.0;
afl->schedule = COE; /* Power schedule (default: COE) */ afl->schedule = EXPLORE; /* Power schedule (default: EXPLORE) */
afl->havoc_max_mult = HAVOC_MAX_MULT; afl->havoc_max_mult = HAVOC_MAX_MULT;
afl->clear_screen = 1; /* Window resized? */ afl->clear_screen = 1; /* Window resized? */

View File

@ -90,13 +90,13 @@ static void usage(u8 *argv0, int more_help) {
"Execution control settings:\n" "Execution control settings:\n"
" -p schedule - power schedules compute a seed's performance score:\n" " -p schedule - power schedules compute a seed's performance score:\n"
" <explore, rare, exploit, seek, mmopt, coe(default), " " <explore(default), rare, exploit, seek, mmopt, coe, "
"fast,\n" "fast,\n"
" lin, quad> -- see docs/power_schedules.md\n" " lin, quad> -- see docs/power_schedules.md\n"
" -f file - location read by the fuzzed program (default: stdin " " -f file - location read by the fuzzed program (default: stdin "
"or @@)\n" "or @@)\n"
" -t msec - timeout for each run (auto-scaled, 50-%d ms)\n" " -t msec - timeout for each run (auto-scaled, 50-%d ms)\n"
" -m megs - memory limit for child process (%d MB)\n" " -m megs - memory limit for child process (%d MB, 0 = no limit)\n"
" -Q - use binary-only instrumentation (QEMU mode)\n" " -Q - use binary-only instrumentation (QEMU mode)\n"
" -U - use unicorn-based instrumentation (Unicorn mode)\n" " -U - use unicorn-based instrumentation (Unicorn mode)\n"
" -W - use qemu-based instrumentation with Wine (Wine " " -W - use qemu-based instrumentation with Wine (Wine "