about summary refs log tree commit diff
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/aflrun-disable-inst-checks.patch13
-rw-r--r--patches/aflrun-keep-all-crashes.patch (renamed from patches/afl++-keep-all-crashes.patch)15
2 files changed, 21 insertions, 7 deletions
diff --git a/patches/aflrun-disable-inst-checks.patch b/patches/aflrun-disable-inst-checks.patch
new file mode 100644
index 0000000..68ea511
--- /dev/null
+++ b/patches/aflrun-disable-inst-checks.patch
@@ -0,0 +1,13 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 9a2a7ad3d307..9c3b6a1b1f96 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -325,7 +325,7 @@ ifdef TEST_MMAP
+ endif
+ 
+ .PHONY: all
+-all:	test_x86 test_shm test_python ready $(PROGS) afl-as llvm gcc_plugin test_build all_done
++all:	test_x86 test_shm test_python ready $(PROGS) afl-as llvm gcc_plugin
+ 	-$(MAKE) -C utils/aflpp_driver
+ 	@echo
+ 	@echo
diff --git a/patches/afl++-keep-all-crashes.patch b/patches/aflrun-keep-all-crashes.patch
index f5e0b7a..e3ce8f6 100644
--- a/patches/afl++-keep-all-crashes.patch
+++ b/patches/aflrun-keep-all-crashes.patch
@@ -1,28 +1,29 @@
 diff --git a/src/afl-fuzz-bitmap.c b/src/afl-fuzz-bitmap.c
-index fd75a822934f..6257403e12a4 100644
+index f05bb7db59d5..de275e374ff1 100644
 --- a/src/afl-fuzz-bitmap.c
 +++ b/src/afl-fuzz-bitmap.c
-@@ -523,7 +523,6 @@ u8 __attribute__((hot)) save_if_interesting(afl_state_t *afl, void *mem,
-     if (likely(!new_bits)) {
+@@ -556,7 +556,6 @@ save_if_interesting(afl_state_t *afl, void *mem, u32 len, u8 fault, u8 inc) {
+     if (likely(!new_bits && !new_paths)) {
  
        if (unlikely(afl->crash_mode)) { ++afl->total_crashes; }
 -      return 0;
  
      }
  
-@@ -804,7 +804,6 @@ u8 __attribute__((hot)) save_if_interesting(afl_state_t *afl, void *mem,
+@@ -837,16 +836,12 @@ save_if_interesting(afl_state_t *afl, void *mem, u32 len, u8 fault, u8 inc) {
  
        ++afl->total_crashes;
  
 -      if (afl->saved_crashes >= KEEP_UNIQUE_CRASH) { return keeping; }
- 
+-
        if (likely(!afl->non_instrumented_mode)) {
  
-@@ -816,7 +816,6 @@ u8 __attribute__((hot)) save_if_interesting(afl_state_t *afl, void *mem,
+         if (!classified) { classify_counts(&afl->fsrv); }
  
          simplify_trace(afl, afl->fsrv.trace_bits);
  
 -        if (!has_new_bits(afl, afl->virgin_crash)) { return keeping; }
- 
+-
        }
  
+       if (unlikely(!afl->saved_crashes) &&