Introspection

fuzzers/libfuzzer_libpng/Cargo.toml

@@ -20,7 +20,8 @@ which = { version = "4.0.2" }
 num_cpus = "1.0"
 
 [dependencies]
-libafl = { path = "../../libafl/" }
+libafl = { path = "../../libafl/", features = ["default", "perf_stats"] }
+# libafl = { path = "../../libafl/", features = ["default"] }
 libafl_targets = { path = "../../libafl_targets/", features = ["pcguard_hitcounts", "libfuzzer"] }
 # TODO Include it only when building cc
 libafl_cc = { path = "../../libafl_cc/" }

fuzzers/libfuzzer_libpng/Makefile

@@ -0,0 +1,52 @@
+PWD=`pwd`
+
+all:
+	# Build the libpng libfuzzer library
+	cargo build --release
+
+    # Build the libpng harness	
+	$(PWD)/target/release/cxx \
+		$(PWD)/harness.cc \
+		$(PWD)/libpng-1.6.37/.libs/libpng16.a \
+		-I$(PWD)/libpng-1.6.37/ \
+		-o fuzzer \
+		-lm -lz
+
+run: all
+	./fuzzer &
+	./fuzzer >/dev/null 2>/dev/null &
+
+test: all
+	timeout 60s ./fuzzer &
+	timeout 59s taskset 0x00000001 ./fuzzer >/dev/null 2>/dev/null &
+	timeout 59s taskset 0x00000002 ./fuzzer >/dev/null 2>/dev/null &
+	timeout 59s taskset 0x00000004 ./fuzzer >/dev/null 2>/dev/null &
+	timeout 59s taskset 0x00000008 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000010 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000020 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000040 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000080 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000100 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000200 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000400 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00000800 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00001000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00002000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00004000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00008000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00010000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00020000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00040000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00080000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00100000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00200000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00400000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x00800000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x01000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x02000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x04000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x08000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x10000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x20000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x40000000 ./fuzzer >/dev/null 2>/dev/null &
+	# timeout 59s taskset 0x80000000 ./fuzzer >/dev/null 2>/dev/null &

fuzzers/libfuzzer_libpng/src/lib.rs

@@ -76,6 +76,7 @@ fn fuzz(corpus_dirs: Vec<PathBuf>, objective_dir: PathBuf, broker_port: u16) ->
             StdRand::with_seed(current_nanos()),
             // Corpus that will be evolved, we keep it in memory for performance
             InMemoryCorpus::new(),
+
             // Feedbacks to rate the interestingness of an input
             tuple_list!(
                 MaxMapFeedback::new_with_observer_track(&edges_observer, true, false),
@@ -84,11 +85,13 @@ fn fuzz(corpus_dirs: Vec<PathBuf>, objective_dir: PathBuf, broker_port: u16) ->
             // Corpus in which we store solutions (crashes in this example),
             // on disk so the user can get them after stopping the fuzzer
             OnDiskCorpus::new(objective_dir).unwrap(),
-            // Feedbacks to recognize an input as solution
+
+            // Objectives to recognize an input as solution
             tuple_list!(CrashFeedback::new(), TimeoutFeedback::new()),
         )
     });
 
+
     println!("We're a client, let's fuzz :)");
 
     // Create a PNG dictionary if not existing
@@ -151,6 +154,9 @@ fn fuzz(corpus_dirs: Vec<PathBuf>, objective_dir: PathBuf, broker_port: u16) ->
 
     fuzzer.fuzz_loop(&mut state, &mut executor, &mut restarting_mgr, &scheduler)?;
 
+    print!("DONE\n");
+    loop {}
+
     // Never reached
     Ok(())
 }

libafl/Cargo.toml

@@ -36,6 +36,7 @@ anymapdbg = ["serde_json"] # uses serde_json to Debug the anymap trait. Disable
 derive = ["libafl_derive"] # provide derive(SerdeAny) macro.
 llmp_small_maps = [] # reduces initial map size for llmp
 llmp_debug = [] # Enables debug output for LLMP
+perf_stats = [] # Include performance statistics of the fuzzing pipeline
 
 [[example]]
 name = "llmp_test"

libafl/src/cpu.rs

@@ -0,0 +1,8 @@
+//! Architecture agnostic utility functions
+
+/// Read the time counter. This is primarily used for benchmarking various components in
+/// the fuzzer.
+#[cfg(target_arch = "x86_64")]
+pub fn read_time_counter() -> u64 {
+    unsafe { core::arch::x86_64::_rdtsc() }
+}

libafl/src/events/llmp.rs

@@ -239,7 +239,7 @@ where
                 let client = stats.client_stats_mut_for(sender_id);
                 client.update_corpus_size(*corpus_size as u64);
                 client.update_executions(*executions as u64, *time);
-                stats.display(event.name().to_string() + " #" + &sender_id.to_string());
+                // stats.display(event.name().to_string() + " #" + &sender_id.to_string());
                 Ok(BrokerEventResult::Forward)
             }
             Event::UpdateStats {
@@ -250,7 +250,35 @@ where
                 // TODO: The stats buffer should be added on client add.
                 let client = stats.client_stats_mut_for(sender_id);
                 client.update_executions(*executions as u64, *time);
-                stats.display(event.name().to_string() + " #" + &sender_id.to_string());
+                if sender_id == 1 {
+                    stats.display(event.name().to_string() + " #" + &sender_id.to_string());
+                }
+                Ok(BrokerEventResult::Handled)
+            }
+            #[cfg(feature = "perf_stats")]
+            Event::UpdatePerfStats {
+                time,
+                executions,
+                perf_stats,
+                phantom: _,
+            } => {
+                // TODO: The stats buffer should be added on client add.
+
+                // Get the client for the sender ID
+                let client = stats.client_stats_mut_for(sender_id);
+
+                // Update the normal stats for this client
+                client.update_executions(*executions as u64, *time);
+
+                // Update the performance stats for this client
+                client.update_perf_stats(*perf_stats);
+
+                // Display the stats via `.display` only on core #1
+                if sender_id == 1 {
+                    stats.display(event.name().to_string() + " #" + &sender_id.to_string());
+                }
+
+                // Correctly handled the event
                 Ok(BrokerEventResult::Handled)
             }
             Event::Objective { objective_size } => {

libafl/src/events/mod.rs

@@ -17,6 +17,9 @@ use crate::{
     Error,
 };
 
+#[cfg(feature = "perf_stats")]
+use crate::stats::ClientPerfStats;
+
 /// The log event severity
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 pub enum LogSeverity {
@@ -97,6 +100,20 @@ where
         executions: usize,
         phantom: PhantomData<I>,
     },
+    /// New stats with performance stats.
+    #[cfg(feature = "perf_stats")]
+    UpdatePerfStats {
+        /// The time of generation of the event
+        time: Duration,
+
+        /// The executions of this client
+        executions: usize,
+
+        /// Current performance statistics
+        perf_stats: ClientPerfStats,
+
+        phantom: PhantomData<I>,
+    },
     /// A new objective was found
     Objective {
         /// Objective corpus size
@@ -136,6 +153,13 @@ where
                 executions: _,
                 phantom: _,
             } => "Stats",
+            #[cfg(feature = "perf_stats")]
+            Event::UpdatePerfStats {
+                time: _,
+                executions: _,
+                perf_stats: _,
+                phantom: _,
+            } => "PerfStats",
             Event::Objective { objective_size: _ } => "Objective",
             Event::Log {
                 severity_level: _,

libafl/src/events/simple.rs

@@ -99,6 +99,19 @@ where
                 stats.display(event.name().to_string());
                 Ok(BrokerEventResult::Handled)
             }
+            #[cfg(feature = "perf_stats")]
+            Event::UpdatePerfStats {
+                time,
+                executions,
+                perf_stats,
+                phantom: _,
+            } => {
+                // TODO: The stats buffer should be added on client add.
+                stats.client_stats_mut()[0].update_executions(*executions as u64, *time);
+                stats.client_stats_mut()[0].update_perf_stats(*perf_stats);
+                stats.display(event.name().to_string());
+                Ok(BrokerEventResult::Handled)
+            }
             Event::Objective { objective_size } => {
                 stats.client_stats_mut()[0].update_objective_size(*objective_size as u64);
                 stats.display(event.name().to_string());

libafl/src/feedbacks/mod.rs

@@ -11,7 +11,11 @@ use crate::{
     corpus::Testcase,
     executors::ExitKind,
     inputs::Input,
+    mark_feedback_time,
     observers::{ObserversTuple, TimeObserver},
+    start_timer,
+    state::HasClientPerfStats,
+    stats::{PerfFeature, NUM_FEEDBACKS},
     Error,
 };
 
@@ -57,6 +61,20 @@ where
         exit_kind: ExitKind,
     ) -> Result<u32, Error>;
 
+    /// Get the total interestingness value from all feedbacks with performance
+    /// statistics included
+    #[cfg(feature = "perf_stats")]
+    fn is_interesting_all_with_perf<OT: ObserversTuple>(
+        &mut self,
+        input: &I,
+        observers: &OT,
+        exit_kind: ExitKind,
+        feedback_stats: &mut [u64; NUM_FEEDBACKS],
+        feedback_index: usize,
+    ) -> Result<u32, Error> {
+        return Ok(0);
+    }
+
     /// Write metadata for this testcase
     fn append_metadata_all(&mut self, testcase: &mut Testcase<I>) -> Result<(), Error>;
 
@@ -105,6 +123,43 @@ where
             + self.1.is_interesting_all(input, observers, exit_kind)?)
     }
 
+    #[cfg(feature = "perf_stats")]
+    fn is_interesting_all_with_perf<OT: ObserversTuple>(
+        &mut self,
+        input: &I,
+        observers: &OT,
+        exit_kind: ExitKind,
+        feedback_stats: &mut [u64; NUM_FEEDBACKS],
+        feedback_index: usize,
+    ) -> Result<u32, Error> {
+        let mut res = 0;
+
+        // Start a timer for this feedback
+        let start_time = crate::cpu::read_time_counter();
+
+        // Execute this feedback
+        res += self.0.is_interesting(input, observers, exit_kind.clone())?;
+
+        // Get the elapsed time for checking this feedback
+        let elapsed = crate::cpu::read_time_counter() - start_time;
+
+        // Add this stat to the feedback metrics
+        feedback_stats[feedback_index] = elapsed;
+
+        // Increment the index
+        let next_index = feedback_index + 1;
+
+        // Continue executing the chain
+        Ok(res
+            + self.1.is_interesting_all_with_perf(
+                input,
+                observers,
+                exit_kind,
+                feedback_stats,
+                next_index,
+            )?)
+    }
+
     fn append_metadata_all(&mut self, testcase: &mut Testcase<I>) -> Result<(), Error> {
         self.0.append_metadata(testcase)?;
         self.1.append_metadata_all(testcase)