improve cargo fuzz compat and bump to newer libAFL version

* bumped libAFL version, which breaks sancov 8bit inline counters for
  some reason. => feature-guarded 8bit inline counters and use pcguard instead.
* use the same paths for corpus/crashes as cargo fuzz => this should
  allow mixing `cargo fuzz` and `cargo libafl`.
* feature-guard the Tui away and instead use `env_logger` by default.

Author: Michael Rodler

cargo-libafl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-libafl"
-version = "0.1.8"
+version = "0.1.9"
 authors = ["Andrea Fioraldi <andreafioraldi@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "A `cargo` wrapper to fuzz Rust code with `LibAFL`"
@@ -28,3 +28,7 @@ toml = "0.5.9"
 cargo-binutils = "0.3.6"
 rustc_version = "0.4"
 xdg = "2.4"
+
+[features]
+sancov_8bit = []
+tui = []

cargo-libafl/build.rs

@@ -47,10 +47,15 @@ fn main() {
     fs::copy(rt_path.join("runtime.rs"), out_path.join("runtime.rs"))
         .expect("Couldn't copy runtime.rs");
 
-    assert!(Command::new("cargo")
-        .current_dir(&out_path)
+    let mut cmd = Command::new("cargo");
+    cmd.current_dir(&out_path)
         .env("CARGO_TARGET_DIR", out_path.join("rt"))
-        .arg("build")
+        .arg("build");
+    #[cfg(feature = "sancov_8bit")]
+    cmd.arg("--features").arg("sancov_8bit");
+    #[cfg(feature = "tui")]
+    cmd.arg("--features").arg("tui");
+    assert!(cmd
         .arg(&format!("--manifest-path={}/Cargo.toml", out_dir))
         .arg("--release")
         .status()

cargo-libafl/cargo-libafl-runtime/Cargo.toml

@@ -13,11 +13,15 @@ edition = "2021"
 [workspace]
 
 [dependencies]
-libafl = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "7ed1ac9" }
-libafl_targets = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "7ed1ac9", features = ["sancov_8bit", "sancov_cmplog"] }
+libafl = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "8ff8ae41f1ed2956bb1e906c5c7bd0505ca110c0" }
+libafl_targets = { git = "https://github.com/AFLplusplus/LibAFL.git", rev = "8ff8ae41f1ed2956bb1e906c5c7bd0505ca110c0", features = ["sancov_8bit", "sancov_pcguard",
+"sancov_cmplog", "pointer_maps"] }
+
 mimalloc = { version = "*", default-features = false }
 portpicker = "0.1.1"
 clap = { version = "4.0", features = ["derive"] }
+env_logger = "0.10"
+log = "*"
 
 [profile.release]
 lto = true
@@ -28,3 +32,7 @@ debug = true
 [lib]
 crate-type = ["staticlib", "rlib"]
 path = "runtime.rs"
+
+[features]
+sancov_8bit = []
+tui = []