Fix for macOS

Author: wtdcode

Cargo.toml

@@ -6,19 +6,28 @@ rust-version = "1.87"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libafl_targets = { version = "0.15.3", features = [
+# For macOS autotokens fix
+libafl_targets = { git = "https://github.com/AFLplusplus/LibAFL", rev = "c604d2dac47e84b7133e85cfd137acf2d6e0175b", features = [
   "pointer_maps",
   "forkserver",
   "cmplog",
   "cmplog_extended_instrumentation",
 ] }
-libafl = "0.15.3"
-libafl_bolts = "0.15.3"
+libafl = { git = "https://github.com/AFLplusplus/LibAFL", rev = "c604d2dac47e84b7133e85cfd137acf2d6e0175b" }
+libafl_bolts = { git = "https://github.com/AFLplusplus/LibAFL", rev = "c604d2dac47e84b7133e85cfd137acf2d6e0175b" }
+# libafl_targets = { path = "../LibAFL/libafl_targets", features = [
+#   "pointer_maps",
+#   "forkserver",
+#   "cmplog",
+#   "cmplog_extended_instrumentation",
+# ] }
+# libafl = {path = "../LibAFL/libafl"}
+# libafl_bolts = {path = "../LibAFL/libafl_bolts"}
 
 serde = { version = "1.0", features = ["derive"] }
 unicorn-engine = { git = "https://github.com/unicorn-engine/unicorn", branch = "dev" }
 log = "0.4"
-nix = { version = "0.29", features = ["signal"] }
+nix = { version = "0.30", features = ["signal"] }
 env_logger = { version = "0.11", optional = true }
 pyo3 = { version = "0.24.0", features = [
   "extension-module",

src/forkserver.rs

@@ -1,6 +1,6 @@
 use std::{
     io::{PipeReader, PipeWriter},
-    os::fd::{AsFd, AsRawFd},
+    os::fd::AsFd,
 };
 
 use libafl_bolts::os::{ChildHandle, ForkResult};
@@ -29,8 +29,8 @@ pub(crate) fn write_u64_to_fd(fd: impl AsFd, message: u64) -> Result<(), uc_afl_
 }
 
 fn read_from_fd(fd: impl AsFd, message: &mut [u8]) -> Result<(), uc_afl_ret> {
-    let bytes_read = nix::unistd::read(fd.as_fd().as_raw_fd(), message)
-        .map_err(|_| uc_afl_ret::UC_AFL_RET_ERROR)?;
+    let bytes_read =
+        nix::unistd::read(fd.as_fd(), message).map_err(|_| uc_afl_ret::UC_AFL_RET_ERROR)?;
     if bytes_read != message.len() {
         return Err(uc_afl_ret::UC_AFL_RET_ERROR);
     }

src/target.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use libafl_bolts::shmem::{ShMemProvider, StdShMemProvider};
+use libafl_bolts::shmem::{ShMemProvider, UnixShMemProvider};
 use libafl_targets::{__afl_map_size, EDGES_MAP_PTR, SHM_FUZZING, cmps::CMPLOG_ENABLED};
 use log::{debug, error, trace, warn};
 use unicorn_engine::{Arch, RegisterARM, Unicorn, uc_error};
@@ -58,8 +58,9 @@ pub fn child_fuzz<'a, D: 'a>(
         trace!("{:?}={:?}", env, val);
     }
 
-    let mut shmem_provider = StdShMemProvider::new()?;
+    let mut shmem_provider = UnixShMemProvider::new()?;
 
+    trace!("Mapping both input shm and coverage shm...");
     let has_afl = libafl_targets::map_input_shared_memory(&mut shmem_provider).is_ok()
         && libafl_targets::map_shared_memory(&mut shmem_provider).is_ok();