Pass Handle to construct CalibrationStage (#3356)

* just pass the handle

* fix?

* ?

* i'm dumb

* fix

* rename

* fix

* fix fix

* further fix

* alloc

* fix

* fix

---------

Co-authored-by: toka <toka@tokas-MacBook-Air.local>

Author: tokatoka

crates/libafl/src/stages/calibrate.rs

@@ -17,7 +17,7 @@ use crate::{
     corpus::{Corpus, HasCurrentCorpusId, SchedulerTestcaseMetadata},
     events::{Event, EventFirer, EventWithStats, LogSeverity},
     executors::{Executor, ExitKind, HasObservers},
-    feedbacks::{HasObserverHandle, map::MapFeedbackMetadata},
+    feedbacks::map::MapFeedbackMetadata,
     fuzzer::Evaluator,
     inputs::Input,
     monitors::stats::{AggregatorOps, UserStats, UserStatsValue},
@@ -400,30 +400,32 @@ where
 {
     /// Create a new [`CalibrationStage`].
     #[must_use]
-    pub fn new<F>(map_feedback: &F) -> Self
+    pub fn new(observer_handle: &Handle<C>, map_feedback_name: Cow<'static, str>) -> Self
     where
-        F: HasObserverHandle<Observer = C> + Named,
+        C: Named,
     {
-        let map_name = map_feedback.name().clone();
         Self {
-            map_observer_handle: map_feedback.observer_handle().clone(),
-            map_name: map_name.clone(),
+            map_observer_handle: observer_handle.clone(),
+            map_name: map_feedback_name.clone(),
             stage_max: CAL_STAGE_START,
             track_stability: true,
             phantom: PhantomData,
             name: Cow::Owned(
-                CALIBRATION_STAGE_NAME.to_owned() + ":" + map_name.into_owned().as_str(),
+                CALIBRATION_STAGE_NAME.to_owned() + ":" + map_feedback_name.into_owned().as_str(),
             ),
         }
     }
 
     /// Create a new [`CalibrationStage`], but without checking stability.
     #[must_use]
-    pub fn ignore_stability<F>(map_feedback: &F) -> Self
+    pub fn ignore_stability<F>(
+        observer_handle: &Handle<C>,
+        map_feedback_name: Cow<'static, str>,
+    ) -> Self
     where
-        F: HasObserverHandle<Observer = C> + Named,
+        C: Named,
     {
-        let mut ret = Self::new(map_feedback);
+        let mut ret = Self::new(observer_handle, map_feedback_name);
         ret.track_stability = false;
         ret
     }

crates/libafl_libfuzzer/runtime/src/lib.rs

@@ -187,6 +187,7 @@ macro_rules! fuzz_with {
             misc::should_use_grimoire,
             observers::{MappedEdgeMapObserver, SizeValueObserver},
         };
+        use libafl_bolts::{tuples::Handled, Named};
 
         let edge_maker = &$edge_maker;
 
@@ -196,6 +197,7 @@ macro_rules! fuzz_with {
             let grimoire = grimoire_metadata.should();
 
             let edges_observer = edge_maker().track_indices().track_novelties();
+            let edges_observer_name = edges_observer.name().clone();
             let size_edges_observer = MappedEdgeMapObserver::new(edge_maker(), SizeValueObserver::default());
 
             let keep_observer = LibfuzzerKeepFeedback::new();
@@ -230,7 +232,7 @@ macro_rules! fuzz_with {
             let generalization = GeneralizationStage::new(&edges_observer);
             let generalization = IfStage::new(|_, _, _, _| Ok(grimoire.into()), tuple_list!(generalization));
 
-            let calibration = CalibrationStage::new(&map_feedback);
+            let calibration = CalibrationStage::new(&edges_observer.handle(), edges_observer_name);
 
             let add_extra_feedback = $extra_feedback;
             let coverage_feedback = add_extra_feedback(

crates/libafl_sugar/src/forkserver.rs

@@ -1,5 +1,6 @@
 //! An `afl`-style forkserver fuzzer.
 //! Use this if your target has complex state that needs to be reset.
+use alloc::borrow::Cow;
 use core::{net::SocketAddr, time::Duration};
 use std::{fs, path::PathBuf};
 
@@ -37,7 +38,7 @@ use libafl_bolts::{
     ownedref::OwnedRefMut,
     rands::StdRand,
     shmem::{ShMem, ShMemProvider, UnixShMemProvider},
-    tuples::{Merge, tuple_list},
+    tuples::{Handled, Merge, tuple_list},
 };
 use libafl_targets::AflppCmpLogMap;
 use typed_builder::TypedBuilder;
@@ -151,7 +152,8 @@ impl ForkserverBytesCoverageSugar<'_> {
             // Extra MapFeedback to deduplicate finds according to the cov map
             let map_objective = MaxMapFeedback::with_name("map_objective", &edges_observer);
 
-            let calibration = CalibrationStage::new(&map_feedback);
+            let calibration =
+                CalibrationStage::new(&edges_observer.handle(), Cow::Borrowed("map_feedback"));
 
             // Feedback to rate the interestingness of an input
             // This one is composed by two Feedbacks in OR

crates/libafl_sugar/src/inprocess.rs

@@ -1,6 +1,7 @@
 //! In-Process fuzzing made easy.
 //! Use this sugar for scaling `libfuzzer`-style fuzzers.
 
+use alloc::borrow::Cow;
 use core::{
     fmt::{self, Debug, Formatter},
     net::SocketAddr,
@@ -36,7 +37,7 @@ use libafl_bolts::{
     ownedref::OwnedMutSlice,
     rands::StdRand,
     shmem::{ShMemProvider, StdShMemProvider},
-    tuples::{Merge, tuple_list},
+    tuples::{Handled, Merge, tuple_list},
 };
 use libafl_targets::{CmpLogObserver, EDGES_MAP_ALLOCATED_SIZE, edges_map_mut_ptr};
 use typed_builder::TypedBuilder;
@@ -170,7 +171,8 @@ where
             // Extra MapFeedback to deduplicate finds according to the cov map
             let map_objective = MaxMapFeedback::with_name("map_objective", &edges_observer);
 
-            let calibration = CalibrationStage::new(&map_feedback);
+            let calibration =
+                CalibrationStage::new(&edges_observer.handle(), Cow::Borrowed("map_feedback"));
 
             // Feedback to rate the interestingness of an input
             // This one is composed by two Feedbacks in OR

crates/libafl_sugar/src/lib.rs

@@ -63,6 +63,8 @@ pub const CORPUS_CACHE_SIZE: usize = 4096;
 #[cfg(feature = "python")]
 use pyo3::prelude::*;
 
+extern crate alloc;
+
 /// The sugar python module
 #[cfg(feature = "python")]
 #[pymodule]

crates/libafl_sugar/src/qemu.rs

@@ -1,4 +1,5 @@
 //! In-Process fuzzer with `QEMU`-based binary-only instrumentation
+use alloc::borrow::Cow;
 use core::{
     fmt::{self, Debug, Formatter},
     net::SocketAddr,
@@ -35,7 +36,7 @@ use libafl_bolts::{
     ownedref::OwnedMutSlice,
     rands::StdRand,
     shmem::{ShMemProvider, StdShMemProvider},
-    tuples::{Merge, tuple_list},
+    tuples::{Handled, Merge, tuple_list},
 };
 #[cfg(not(any(feature = "mips", feature = "hexagon")))]
 use libafl_qemu::modules::CmpLogModule;
@@ -187,8 +188,10 @@ where
             // Extra MapFeedback to deduplicate finds according to the cov map
             let map_objective = MaxMapFeedback::with_name("map_objective", &edges_observer);
 
-            let calibration = CalibrationStage::new(&map_feedback);
-            let calibration_cmplog = CalibrationStage::new(&map_feedback);
+            let calibration =
+                CalibrationStage::new(&edges_observer.handle(), Cow::Borrowed("map_feedback"));
+            let calibration_cmplog =
+                CalibrationStage::new(&edges_observer.handle(), Cow::Borrowed("map_feedback"));
 
             // Feedback to rate the interestingness of an input
             // This one is composed by two Feedbacks in OR

fuzzers/baby/baby_fuzzer_custom_executor/src/main.rs

@@ -1,6 +1,6 @@
 #[cfg(windows)]
 use std::ptr::write_volatile;
-use std::{marker::PhantomData, path::PathBuf, ptr::write};
+use std::{borrow::Cow, marker::PhantomData, path::PathBuf, ptr::write};
 
 #[cfg(feature = "tui")]
 use libafl::monitors::tui::TuiMonitor;
@@ -22,7 +22,12 @@ use libafl::{
     state::{HasCorpus, HasExecutions, StdState},
     BloomInputFilter,
 };
-use libafl_bolts::{current_nanos, nonzero, rands::StdRand, tuples::tuple_list, AsSlice};
+use libafl_bolts::{
+    current_nanos, nonzero,
+    rands::StdRand,
+    tuples::{tuple_list, Handled},
+    AsSlice,
+};
 /// Coverage map with explicit assignments due to the lack of instrumentation
 static mut SIGNALS: [u8; 16] = [0; 16];
 static mut SIGNALS_PTR: *mut u8 = &raw mut SIGNALS as _;
@@ -85,7 +90,7 @@ pub fn main() {
     // Feedback to rate the interestingness of an input
     let mut feedback = MaxMapFeedback::new(&observer);
 
-    let calibration_stage = CalibrationStage::new(&feedback);
+    let calibration_stage = CalibrationStage::new(&observer.handle(), Cow::Borrowed("signals"));
     let stats_stage = AflStatsStage::builder()
         .map_observer(&observer)
         .build()

fuzzers/baby/tutorial/src/lib.rs

@@ -4,7 +4,7 @@
 //#![feature(min_const_generics)]
 
 use core::time::Duration;
-use std::{env, path::PathBuf};
+use std::{borrow::Cow, env, path::PathBuf};
 
 use libafl::{
     corpus::{Corpus, InMemoryCorpus, OnDiskCorpus},
@@ -21,7 +21,11 @@ use libafl::{
     state::{HasCorpus, StdState},
     Error, Fuzzer,
 };
-use libafl_bolts::{rands::StdRand, tuples::tuple_list, AsSlice};
+use libafl_bolts::{
+    rands::StdRand,
+    tuples::{tuple_list, Handled},
+    AsSlice,
+};
 use libafl_targets::{libfuzzer_initialize, libfuzzer_test_one_input, std_edges_map_observer};
 
 mod input;
@@ -93,7 +97,7 @@ fn fuzz(corpus_dirs: &[PathBuf], objective_dir: PathBuf, broker_port: u16) -> Re
 
     let map_feedback = MaxMapFeedback::new(&edges_observer);
 
-    let calibration = CalibrationStage::new(&map_feedback);
+    let calibration = CalibrationStage::new(&edges_observer.handle(), Cow::Borrowed("edges"));
 
     // Feedback to rate the interestingness of an input
     // This one is composed by two Feedbacks in OR

fuzzers/binary_only/fuzzbench

@@ -4,6 +4,7 @@ use core::cell::RefCell;
 #[cfg(unix)]
 use std::os::unix::io::FromRawFd;
 use std::{
+    borrow::Cow,
     env,
     fs::{self, File, OpenOptions},
     io::Write,
@@ -44,7 +45,7 @@ use libafl_bolts::{
     current_time,
     rands::StdRand,
     shmem::{ShMemProvider, StdShMemProvider},
-    tuples::{tuple_list, Merge},
+    tuples::{tuple_list, Handled, Merge},
     AsSlice, AsSliceMut,
 };
 use libafl_qemu::{
@@ -276,7 +277,7 @@ fn fuzz(
 
     let map_feedback = MaxMapFeedback::new(&edges_observer);
 
-    let calibration = CalibrationStage::new(&map_feedback);
+    let calibration = CalibrationStage::new(&edges_observer.handle(), Cow::Borrowed("edges"));
 
     // Feedback to rate the interestingness of an input
     // This one is composed by two Feedbacks in OR