aflplusplus-persistent is not supported on macOS

trailofbits · Sep 30, 2024 · 13a16d5 · 13a16d5
1 parent 277cf93
commit 13a16d5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/cargo-test-fuzz/src/fuzzer/mod.rs b/cargo-test-fuzz/src/fuzzer/mod.rs
@@ -1,16 +1,23 @@
 use super::{Executable, TestFuzz};
-use anyhow::Result;
+use anyhow::{ensure, Result};
 use internal::Fuzzer;
 use semver::Version;
 use std::{path::Path, process::Command};
 
 mod impls;
 
-pub(super) fn instantiate(fuzzer: Fuzzer) -> &'static dyn Interface {
+pub(super) fn instantiate(fuzzer: Fuzzer) -> Result<&'static dyn Interface> {
     match fuzzer {
-        Fuzzer::Aflplusplus => impls::aflplusplus::instantiate(false),
-        Fuzzer::AflplusplusPersistent => impls::aflplusplus::instantiate(true),
-        Fuzzer::Libfuzzer => impls::libfuzzer::instantiate(),
+        Fuzzer::Aflplusplus => Ok(impls::aflplusplus::instantiate(false)),
+        Fuzzer::AflplusplusPersistent => {
+            // smoelius: https://github.com/AFLplusplus/AFLplusplus/blob/7b40d7b9420b2e3adb7d9afa88610199718dedba/include/forkserver.h#L114-L118
+            ensure!(
+                cfg!(not(target_os = "macos")),
+                "`aflplusplus-persistent` is not supported on macOS"
+            );
+            Ok(impls::aflplusplus::instantiate(true))
+        }
+        Fuzzer::Libfuzzer => Ok(impls::libfuzzer::instantiate()),
     }
 }
 

diff --git a/cargo-test-fuzz/src/lib.rs b/cargo-test-fuzz/src/lib.rs
@@ -155,7 +155,7 @@ fn run(opts: TestFuzz) -> Result<()> {
     };
 
     let fuzzer_env = fuzzer()?;
-    let fuzzer = fuzzer::instantiate(opts.fuzzer.unwrap_or(fuzzer_env));
+    let fuzzer = fuzzer::instantiate(opts.fuzzer.unwrap_or(fuzzer_env))?;
 
     if let Some(object) = opts.replay {
         ensure!(

diff --git a/internal/src/fuzzer.rs b/internal/src/fuzzer.rs
@@ -9,7 +9,7 @@ use strum_macros::{Display, EnumIter};
 // command line option. Hence, cargo-test-fuzz needs to know all available fuzzers. This is unlike
 // the Serde format, which the user selects via a Cargo feature.
 #[derive(
-    Clone, Copy, Debug, Display, Deserialize, EnumIter, PartialEq, Eq, Serialize, ValueEnum,
+    Clone, Copy, Debug, Deserialize, Display, EnumIter, PartialEq, Eq, Serialize, ValueEnum,
 )]
 #[remain::sorted]
 pub enum Fuzzer {

diff --git a/test-fuzz/tests/github.rs b/test-fuzz/tests/github.rs
@@ -14,7 +14,7 @@ enum SerdeFormat {
     Cbor4ii,
 }
 
-#[derive(Clone, Copy, Debug, Display, EnumIter)]
+#[derive(Clone, Copy, Debug, Display, EnumIter, Eq, PartialEq)]
 enum Environment {
     UbuntuLatest,
     MacosLatest,
@@ -31,8 +31,8 @@ fn matrix() {
     let expecteds = std::iter::repeat(
         Fuzzer::iter()
             .cartesian_product(Environment::iter())
-            .filter(|(fuzzer, environment)| {
-                *fuzzer != Fuzzer::AflplusplusPersistent || *environment != Environment::MacosLatest
+            .filter(|&(fuzzer, environment)| {
+                fuzzer != Fuzzer::AflplusplusPersistent || environment != Environment::MacosLatest
             }),
     )
     .take(2)
@@ -58,6 +58,11 @@ fn matrix() {
     for (expected, actual) in expecteds.zip(actuals) {
         let ((expected_fuzzer, expected_environment), (expected_serde_format, expected_toolchain)) =
             expected;
+        if expected_fuzzer == Fuzzer::AflplusplusPersistent
+            && expected_environment == Environment::MacosLatest
+        {
+            continue;
+        }
         assert_eq!(
             expected_fuzzer.to_string().to_kebab_case(),
             actual["fuzzer"].as_str().unwrap()