Merge remote-tracking branch 'upstream/main' into main

Author: mkravchik

.github/workflows/build_and_test.yml

@@ -294,7 +294,8 @@ jobs:
           - ./fuzzers/libfuzzer_libpng_launcher
           - ./fuzzers/libfuzzer_libpng_accounting
           - ./fuzzers/forkserver_libafl_cc
-          - ./fuzzers/libfuzzer_libpng_tcp_manager
+          # - ./fuzzers/libfuzzer_libpng_tcp_manager
+          # - ./fuzzers/sqlite_centralized_multi_machine
           - ./fuzzers/backtrace_baby_fuzzers
           - ./fuzzers/fuzzbench_qemu
           - ./fuzzers/nyx_libxml2_parallel

.gitignore

@@ -7,6 +7,7 @@ vendor
 .DS_Store
 .env
 
+*.test
 *.tmp
 *.swp
 *.o

Cargo.toml

@@ -20,6 +20,7 @@ members = [
     "utils/deexit",
     "utils/libafl_benches",
     "utils/gramatron/construct_automata",
+    "utils/desyscall",
 ]
 default-members = [
     "libafl",
@@ -36,11 +37,13 @@ exclude = [
     "utils/noaslr",
     "utils/gdb_qemu",
     "utils/libafl_fmt",
+    "utils/desyscall",
+    "utils/multi_machine_generator",
     "scripts",
 ]
 
 [workspace.package]
-version = "0.12.0"
+version = "0.13.0"
 
 [profile.release]
 lto = true

README.md

@@ -1,16 +1,16 @@
 [package]
 name = "pylibafl"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 
 [dependencies]
 pyo3 = { version = "0.18.3", features = ["extension-module"] }
 pyo3-log = "0.8.1"
-libafl_sugar = { path = "../../libafl_sugar", version = "0.12.0", features = ["python"] }
-libafl_bolts = { path = "../../libafl_bolts", version = "0.12.0", features = ["python"] }
+libafl_sugar = { path = "../../libafl_sugar", version = "0.13.0", features = ["python"] }
+libafl_bolts = { path = "../../libafl_bolts", version = "0.13.0", features = ["python"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-libafl_qemu = { path = "../../libafl_qemu", version = "0.12.0", features = ["python"] }
+libafl_qemu = { path = "../../libafl_qemu", version = "0.13.0", features = ["python"] }
 
 [build-dependencies]
 pyo3-build-config = { version = "0.17" }

bindings/pylibafl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_gramatron"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_fuzzer_gramatron/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_grimoire"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_fuzzer_grimoire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_minimizing"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>", "Addison Crump <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_fuzzer_minimizing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_nautilus"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_fuzzer_nautilus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_swap_differential"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Addison Crump <[email protected]>"]
 edition = "2021"
 default-run = "fuzzer_sd"

fuzzers/baby_fuzzer_swap_differential/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_tokens"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_fuzzer_tokens/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_fuzzer_with_forkexecutor"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_fuzzer_with_forkexecutor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "baby_no_std"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/baby_no_std/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dynamic_analysis"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/dynamic_analysis/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "forkserver_simple"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["tokatoka <[email protected]>"]
 edition = "2021"
 

fuzzers/forkserver_simple/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "frida_gdiplus"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Richard Johnson <[email protected]>"]
 edition = "2021"
 

fuzzers/frida_gdiplus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "frida_fuzzer"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/frida_libpng/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench_ctx"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench_ctx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench_fork_qemu"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench_fork_qemu/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench_forkserver"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench_forkserver/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench_forkserver_cmplog"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench_forkserver_cmplog/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench_qemu"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench_qemu/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuzzbench_text"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/fuzzbench_text/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libafl_atheris"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/libafl_atheris/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libmozjpeg"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/libfuzzer_libmozjpeg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libpng"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/libfuzzer_libpng/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libpng_accounting"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/libfuzzer_libpng_accounting/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libpng_launcher_centralized"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/libfuzzer_libpng_centralized/Cargo.toml

@@ -136,7 +136,7 @@ pub extern "C" fn libafl_main() {
     let monitor = MultiMonitor::new(|s| println!("{s}"));
 
     let mut secondary_run_client = |state: Option<_>,
-                                    mut mgr: CentralizedEventManager<_, _>,
+                                    mut mgr: CentralizedEventManager<_, _, _, _>,
                                     _core_id: CoreId| {
         // Create an observation channel using the coverage map
         let edges_observer =

fuzzers/libfuzzer_libpng_centralized/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libpng_cmin"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>", "Addison Crump <[email protected]>"]
 edition = "2021"
 

fuzzers/libfuzzer_libpng_cmin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libpng_launcher"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/libfuzzer_libpng_launcher/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_libpng_tcp_manager"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 
@@ -18,7 +18,7 @@ debug = true
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
-which = "4.4"
+which = "6.0"
 
 [dependencies]
 libafl = { path = "../../libafl/", features = ["default", "tcp_manager"] }

fuzzers/libfuzzer_libpng_tcp_manager/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_stb_image"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 build = "build.rs"

fuzzers/libfuzzer_stb_image/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_stb_image_concolic"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>", "Julius Hohnerlein"]
 edition = "2021"
 build = "build.rs"

fuzzers/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "example_runtime"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 authors = ["Julius Hohnerlein <[email protected]>"]
 

fuzzers/libfuzzer_stb_image_concolic/runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libfuzzer_stb_image_sugar"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 build = "build.rs"

fuzzers/libfuzzer_stb_image_sugar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nautilus_sync"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/nautilus_sync/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nyx_libxml2_parallel"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 default-run = "nyx_libxml2_parallel"
 

fuzzers/nyx_libxml2_parallel/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nyx_libxml2_standalone"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 default-run = "nyx_libxml2_standalone"
 

fuzzers/nyx_libxml2_standalone/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "qemu_cmin"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>", "WorksButNotTested"]
 edition = "2021"
 

fuzzers/qemu_cmin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "qemu_coverage"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>", "WorksButNotTested"]
 edition = "2021"
 

fuzzers/qemu_coverage/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "qemu_launcher"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"
 

fuzzers/qemu_launcher/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "qemu_systemmode"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Andrea Fioraldi <[email protected]>", "Dominik Maier <[email protected]>"]
 edition = "2021"