Merge pull request #89 from fitzgen/update-libfuzzer-60e32a1

Update libFuzzer to llvm/llvm-project@60e32a1
rust-fuzz · Mar 3, 2022 · 76f10a7 · 76f10a7
2 parents fcf3b18 + 1aa53e0
commit 76f10a7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ci/script.sh b/ci/script.sh
@@ -11,7 +11,8 @@ pushd ./example
 cargo rustc \
       --release \
       -- \
-      -Cpasses='sancov' \
+      -Ccodegen-units=1 \
+      -Cpasses=sancov-module \
       -Cllvm-args=-sanitizer-coverage-level=3 \
       -Cllvm-args=-sanitizer-coverage-trace-compares \
       -Cllvm-args=-sanitizer-coverage-inline-8bit-counters \
@@ -26,7 +27,8 @@ pushd ./example_arbitrary
 cargo rustc \
       --release \
       -- \
-      -Cpasses='sancov' \
+      -Ccodegen-units=1 \
+      -Cpasses=sancov-module \
       -Cllvm-args=-sanitizer-coverage-level=3 \
       -Cllvm-args=-sanitizer-coverage-trace-compares \
       -Cllvm-args=-sanitizer-coverage-inline-8bit-counters \
@@ -46,7 +48,8 @@ pushd ./example_mutator
 cargo rustc \
       --release \
       -- \
-      -Cpasses='sancov' \
+      -Ccodegen-units=1 \
+      -Cpasses=sancov-module \
       -Cllvm-args=-sanitizer-coverage-level=3 \
       -Cllvm-args=-sanitizer-coverage-trace-compares \
       -Cllvm-args=-sanitizer-coverage-inline-8bit-counters \

diff --git a/example/src/main.rs b/example/src/main.rs
@@ -3,7 +3,7 @@
 use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
-    if data == b"banana!" {
+    if data == "banana!".as_bytes() {
         panic!("success!");
     }
 });
diff --git a/libfuzzer/FuzzerInterceptors.cpp b/libfuzzer/FuzzerInterceptors.cpp
@@ -25,6 +25,7 @@
   }
 
 #include <cassert>
+#include <cstddef> // for size_t
 #include <cstdint>
 #include <dlfcn.h> // for dlsym()
 

diff --git a/libfuzzer/dataflow/DataFlow.cpp b/libfuzzer/dataflow/DataFlow.cpp
@@ -17,11 +17,9 @@
 // and also provides basic-block coverage for every input.
 //
 // Build:
-//   1. Compile this file (DataFlow.cpp) with -fsanitize=dataflow -mllvm
-//       -dfsan-fast-16-labels and -O2.
+//   1. Compile this file (DataFlow.cpp) with -fsanitize=dataflow and -O2.
 //   2. Compile DataFlowCallbacks.cpp with -O2 -fPIC.
 //   3. Build the fuzz target with -g -fsanitize=dataflow
-//       -mllvm -dfsan-fast-16-labels
 //       -fsanitize-coverage=trace-pc-guard,pc-table,bb,trace-cmp
 //   4. Link those together with -fsanitize=dataflow
 //
@@ -82,7 +80,7 @@ static inline bool BlockIsEntry(size_t BlockIdx) {
   return __dft.PCsBeg[BlockIdx * 2 + 1] & PCFLAG_FUNC_ENTRY;
 }
 
-const int kNumLabels = 16;
+const int kNumLabels = 8;
 
 // Prints all instrumented functions.
 static int PrintFunctions() {