misc

Author: baflor

Cargo.lock

@@ -8,7 +8,7 @@ rust-version = "1.90"
 
 [dependencies]
 wat = "1.0"
-wasmparser = "0.243"
+wasmparser = "0.244"
 rustc-demangle = "0.1"
 clap = { version = "4.4", features = ["derive", "env"] }
 md5 = "0.8"

Cargo.toml

@@ -109,6 +109,18 @@ def time_as_seconds(v: str):
     "libafl-libfuzzer-wasm2c",
 ]
 
+if args.fuzzer == ["wasmfuzz|pass-ablations"]:
+    PASSES = [
+        "baseline", "cmpcov_hamming", "cmpcov_absdist", "perffuzz_func",
+        "perffuzz_bb", "perffuzz_edge", "perffuzz_edge_global", "func_rec_depth",
+        "call_value_profile", "func_input_size", "memory_op_value", "memory_op_address",
+        "path_hash_func", "path_hash_edge", "func_shortest_trace", "edge_shortest_trace",
+        "func_longest_trace", "func_rec_depth", "call_value_profile", "func_input_size",
+        "memory_op_value", "memory_op_address", "path_hash_func", "path_hash_edge",
+        "func_shortest_trace", "edge_shortest_trace", "func_longest_trace",
+    ]
+    fuzzers = [f"wasmfuzz|pass-ablation-{pass_}" for pass_ in PASSES]
+
 class LibfuzzerMonitor:
     def __init__(self, bin_path: Path, bucket:str, target_name: str, interval_secs=30, only_new=False):
         self.bin_path = bin_path

eval/container-runner.py

@@ -477,9 +477,6 @@ def snapshot_summary(path):
     "39838838ec2d49021548f90cec60cc3d8f56b188",
     Tag.CRASHING,
 )
-tag_manually(
-    "zlib-rs-end_to_end.wasm", "39838838ec2d49021548f90cec60cc3d8f56b188", Tag.CRASHING
-)
 
 tag_manually("libzstd-rs-sys-decompress.wasm", "536f7b3017c07b9ab924af6ae1dcdb4b4ab0ef3d", Tag.CRASHING)
 tag_manually("libzstd-rs-sys-decompress_overlapping.wasm", "536f7b3017c07b9ab924af6ae1dcdb4b4ab0ef3d", Tag.CRASHING)

harness-suite/crashes/comrak-all_options.bin

@@ -559,7 +559,9 @@ impl Orchestrator {
         if self.opts.experiment == Some(Experiment::PassAblation) {
             let pass =
                 std::env::var("FUZZER_PASS_ABLATION").expect("FUZZER_PASS_ABLATION must be set");
-            opts.activate_from_str(&pass);
+            if pass != "baseline" {
+                opts.activate_from_str(&pass);
+            }
         } else if !is_saturated && self.rng.random_ratio(8, 10) {
             let mut light_knobs = [
                 &mut *cmpcov_absdist,

harness-suite/crashes/zip2-fuzz_write.wasm

@@ -117,7 +117,7 @@ impl ModuleSpec {
             .parse_all(module_binary)
             .try_fold(Vec::new(), |mut acc, el| {
                 if let Payload::ImportSection(imports) = el? {
-                    for import in imports {
+                    for import in imports.into_imports() {
                         let import = import?;
                         let name = format!("{}::{}", import.module, import.name);
                         acc.push(name);
@@ -132,7 +132,7 @@ impl ModuleSpec {
             .parse_all(module_binary)
             .try_fold(Vec::new(), |mut acc, el| {
                 if let Payload::ImportSection(imports) = el? {
-                    for import in imports {
+                    for import in imports.into_imports() {
                         let import = import?;
                         if let wasmparser::TypeRef::Func(tyidx) = import.ty {
                             acc.push(tyidx);