Address comments from AFLplusplus#2302 (AFLplusplus#2322)

* Address comments from AFLplusplus#2302

* secure?

* cleanup

* early exit ftw

* address clippy

* Fix all the things

libafl/Cargo.toml

@@ -58,6 +58,12 @@ handle_sigpipe = []
 
 #! ## Additional Components
 
+## Enables `TcpEventManager`, a simple EventManager proxying everything via TCP. This uses `tokio`.
+tcp_manager = ["tokio", "std"]
+
+## Enables compression for the TCP manager
+tcp_compression = ["tcp_manager", "libafl_bolts/gzip"]
+
 ## Enable multi-machine support
 multi_machine = ["tokio", "std", "enumflags2", "ahash/std"]
 

libafl/src/events/broker_hooks/centralized_multi_machine.rs

@@ -14,7 +14,6 @@ use libafl_bolts::{
     shmem::ShMemProvider,
     ClientId, Error,
 };
-use log::debug;
 use tokio::{
     net::ToSocketAddrs,
     runtime::Runtime,
@@ -102,7 +101,7 @@ where
     A: Clone + Display + ToSocketAddrs + Send + Sync + 'static,
     I: Input + Send + Sync + 'static,
 {
-    /// Should not be created alone. Use [`TcpMultiMachineBuilder`] instead.
+    /// Should not be created alone. Use [`TcpMultiMachineHooksBuilder`] instead.
     pub(crate) fn new(
         shared_state: Arc<RwLock<TcpMultiMachineState<A>>>,
         rt: Arc<Runtime>,
@@ -120,8 +119,13 @@ where
     A: Clone + Display + ToSocketAddrs + Send + Sync + 'static,
     I: Input + Send + Sync + 'static,
 {
-    /// Should not be created alone. Use [`TcpMultiMachineBuilder`] instead.
-    pub(crate) fn new(
+    /// Should not be created alone. Use [`TcpMultiMachineHooksBuilder`] instead.
+    ///
+    /// # Safety
+    /// For [`Self::on_new_message`], this struct assumes that the `msg` parameter
+    /// (or rather, the memory it points to), lives sufficiently long
+    /// for an async background task to process it.
+    pub(crate) unsafe fn new(
         shared_state: Arc<RwLock<TcpMultiMachineState<A>>>,
         rt: Arc<Runtime>,
     ) -> Self {
@@ -200,7 +204,7 @@ where
             // TODO: do not copy here
             state_wr_lock.add_past_msg(msg);
 
-            debug!("Sending msg...");
+            log::debug!("Sending msg...");
 
             state_wr_lock
                 .send_interesting_event_to_nodes(&mm_msg)
@@ -239,7 +243,7 @@ where
                 .receive_new_messages_from_nodes(&mut incoming_msgs)
                 .await?;
 
-            debug!("received {} new incoming msg(s)", incoming_msgs.len());
+            log::debug!("received {} new incoming msg(s)", incoming_msgs.len());
 
             let msgs_to_forward: Result<Vec<(Tag, Flags, Vec<u8>)>, Error> = incoming_msgs
                 .into_iter()

libafl/src/events/centralized.rs

@@ -22,7 +22,6 @@ use libafl_bolts::{
     tuples::Handle,
     ClientId,
 };
-use log::debug;
 use serde::{Deserialize, Serialize};
 
 use super::NopEventManager;
@@ -551,7 +550,7 @@ where
             };
             let event: Event<<<Self as UsesState>::State as UsesInput>::Input> =
                 postcard::from_bytes(event_bytes)?;
-            debug!("Processor received message {}", event.name_detailed());
+            log::debug!("Processor received message {}", event.name_detailed());
             self.handle_in_main(fuzzer, executor, state, client_id, event)?;
             count += 1;
         }
@@ -574,7 +573,7 @@ where
         Z: ExecutionProcessor<E::Observers, State = <Self as UsesState>::State>
             + EvaluatorObservers<E::Observers>,
     {
-        debug!("handle_in_main!");
+        log::debug!("handle_in_main!");
 
         let event_name = event.name_detailed();
 
@@ -591,7 +590,7 @@ where
                 #[cfg(feature = "multi_machine")]
                 node_id,
             } => {
-                debug!(
+                log::debug!(
                     "Received {} from {client_id:?} ({client_config:?}, forward {forward_id:?})",
                     event_name
                 );
@@ -604,7 +603,7 @@ where
                         {
                             state.scalability_monitor_mut().testcase_with_observers += 1;
                         }
-                        debug!(
+                        log::debug!(
                             "[{}] Running fuzzer with event {}",
                             process::id(),
                             event_name
@@ -622,7 +621,7 @@ where
                         {
                             state.scalability_monitor_mut().testcase_without_observers += 1;
                         }
-                        debug!(
+                        log::debug!(
                             "[{}] Running fuzzer with event {}",
                             process::id(),
                             event_name
@@ -652,15 +651,15 @@ where
 
                     self.hooks.on_fire_all(state, client_id, &event)?;
 
-                    debug!(
+                    log::debug!(
                         "[{}] Adding received Testcase {} as item #{item}...",
                         process::id(),
                         event_name
                     );
 
                     self.inner.fire(state, event)?;
                 } else {
-                    debug!("[{}] {} was discarded...)", process::id(), event_name);
+                    log::debug!("[{}] {} was discarded...)", process::id(), event_name);
                 }
             }
             _ => {

libafl/src/events/launcher.rs

@@ -46,8 +46,6 @@ use libafl_bolts::{
     shmem::ShMemProvider,
     tuples::{tuple_list, Handle},
 };
-#[cfg(all(unix, feature = "std", feature = "fork"))]
-use log::debug;
 #[cfg(feature = "std")]
 use typed_builder::TypedBuilder;
 
@@ -57,7 +55,7 @@ use super::StdLlmpEventHook;
 #[cfg(all(unix, feature = "std", feature = "fork", feature = "multi_machine"))]
 use crate::events::multi_machine::NodeDescriptor;
 #[cfg(all(unix, feature = "std", feature = "fork", feature = "multi_machine"))]
-use crate::events::multi_machine::TcpMultiMachineBuilder;
+use crate::events::multi_machine::TcpMultiMachineHooks;
 #[cfg(all(unix, feature = "std", feature = "fork"))]
 use crate::events::{centralized::CentralizedEventManager, CentralizedLlmpHook};
 #[cfg(all(unix, feature = "std", feature = "fork"))]
@@ -657,7 +655,7 @@ where
         let num_cores = core_ids.len();
         let mut handles = vec![];
 
-        debug!("spawning on cores: {:?}", self.cores);
+        log::debug!("spawning on cores: {:?}", self.cores);
 
         self.opened_stdout_file = self
             .stdout_file
@@ -700,7 +698,7 @@ where
 
                         if index == 1 {
                             // Main client
-                            debug!("Running main client on PID {}", std::process::id());
+                            log::debug!("Running main client on PID {}", std::process::id());
                             let (state, mgr) =
                                 main_inner_mgr_builder.take().unwrap()(self, *bind_to)?;
 
@@ -721,7 +719,7 @@ where
                             self.main_run_client.take().unwrap()(state, c_mgr, *bind_to)
                         } else {
                             // Secondary clients
-                            debug!("Running secondary client on PID {}", std::process::id());
+                            log::debug!("Running secondary client on PID {}", std::process::id());
                             let (state, mgr) =
                                 secondary_inner_mgr_builder.take().unwrap()(self, *bind_to)?;
 
@@ -744,11 +742,18 @@ where
 
         #[cfg(feature = "multi_machine")]
         // Create this after forks, to avoid problems with tokio runtime
-        let (multi_machine_sender_hook, multi_machine_receiver_hook) =
-            TcpMultiMachineBuilder::build::<
-                SocketAddr,
-                <<EM as UsesState>::State as UsesInput>::Input,
-            >(self.multi_machine_node_descriptor.clone())?;
+
+        // # Safety
+        // The `multi_machine_receiver_hook` needs messages to outlive the receiver.
+        // The underlying memory region for incoming messages lives longer than the async thread processing them.
+        let TcpMultiMachineHooks {
+            sender: multi_machine_sender_hook,
+            receiver: multi_machine_receiver_hook,
+        } = unsafe {
+            TcpMultiMachineHooks::builder()
+                .node_descriptor(self.multi_machine_node_descriptor.clone())
+                .build::<<<EM as UsesState>::State as UsesInput>::Input>()?
+        };
 
         let mut brokers = Brokers::new();
 
@@ -812,7 +817,7 @@ where
             brokers.add(Box::new(broker));
         }
 
-        debug!(
+        log::debug!(
             "Brokers have been initialized on port {}.",
             std::process::id()
         );

libafl/src/events/llmp/mgr.rs

@@ -25,7 +25,6 @@ use libafl_bolts::{
     llmp::{recv_tcp_msg, send_tcp_msg, TcpRequest, TcpResponse},
     IP_LOCALHOST,
 };
-use log::debug;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "llmp_compression")]
@@ -370,7 +369,7 @@ where
             Ok(_) => (),
             Err(e) => log::error!("Failed to send tcp message {:#?}", e),
         }
-        debug!("Asking he broker to be disconnected");
+        log::debug!("Asking he broker to be disconnected");
         Ok(())
     }
 
@@ -423,11 +422,11 @@ where
                 ..
             } => {
                 #[cfg(feature = "std")]
-                debug!("[{}] Received new Testcase {evt_name} from {client_id:?} ({client_config:?}, forward {forward_id:?})", std::process::id());
+                log::debug!("[{}] Received new Testcase {evt_name} from {client_id:?} ({client_config:?}, forward {forward_id:?})", std::process::id());
 
                 if self.always_interesting {
                     let item = fuzzer.add_input(state, executor, self, input)?;
-                    debug!("Added received Testcase as item #{item}");
+                    log::debug!("Added received Testcase as item #{item}");
                 } else {
                     let res = if client_config.match_with(&self.configuration)
                         && observers_buf.is_some()
@@ -455,9 +454,9 @@ where
                         )?
                     };
                     if let Some(item) = res.1 {
-                        debug!("Added received Testcase {evt_name} as item #{item}");
+                        log::debug!("Added received Testcase {evt_name} as item #{item}");
                     } else {
-                        debug!("Testcase {evt_name} was discarded");
+                        log::debug!("Testcase {evt_name} was discarded");
                     }
                 }
             }
@@ -620,7 +619,7 @@ where
                 msg
             };
             let event: Event<S::Input> = postcard::from_bytes(event_bytes)?;
-            debug!("Received event in normal llmp {}", event.name_detailed());
+            log::debug!("Received event in normal llmp {}", event.name_detailed());
             self.handle_in_client(fuzzer, executor, state, client_id, event)?;
             count += 1;
         }

libafl/src/events/llmp/mod.rs

@@ -13,7 +13,6 @@ use libafl_bolts::{
     shmem::{NopShMemProvider, ShMemProvider},
     ClientId,
 };
-use log::debug;
 use serde::Deserialize;
 
 use crate::{
@@ -303,7 +302,7 @@ where
             Event::NewTestcase {
                 input, forward_id, ..
             } => {
-                debug!("Received new Testcase to convert from {client_id:?} (forward {forward_id:?}, forward {forward_id:?})");
+                log::debug!("Received new Testcase to convert from {client_id:?} (forward {forward_id:?}, forward {forward_id:?})");
 
                 let Some(converter) = self.converter_back.as_mut() else {
                     return Ok(());
@@ -377,7 +376,7 @@ where
             };
 
             let event: Event<DI> = postcard::from_bytes(event_bytes)?;
-            debug!("Processor received message {}", event.name_detailed());
+            log::debug!("Processor received message {}", event.name_detailed());
             self.handle_in_client(fuzzer, executor, state, manager, client_id, event)?;
             count += 1;
         }

libafl/src/events/llmp/restarting.rs

@@ -31,8 +31,6 @@ use libafl_bolts::{
 use libafl_bolts::{
     llmp::LlmpConnection, os::CTRL_C_EXIT, shmem::StdShMemProvider, staterestore::StateRestorer,
 };
-#[cfg(all(unix, feature = "fork"))]
-use log::debug;
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "std")]
 use typed_builder::TypedBuilder;
@@ -564,7 +562,7 @@ where
                             handle.status()
                         }
                         ForkResult::Child => {
-                            debug!(
+                            log::debug!(
                                 "{} has been forked into {}",
                                 std::os::unix::process::parent_id(),
                                 std::process::id()

libafl/src/events/mod.rs

@@ -16,6 +16,9 @@ pub mod launcher;
 #[allow(clippy::ignored_unit_patterns)]
 pub mod llmp;
 pub use llmp::*;
+#[cfg(feature = "tcp_manager")]
+#[allow(clippy::ignored_unit_patterns)]
+pub mod tcp;
 
 pub mod broker_hooks;
 use alloc::{