From 7236fd9f3cae620a09db8d08aa2e91bba5959bca Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Mon, 15 Feb 2021 15:28:40 +0100 Subject: [PATCH] fmt --- afl/src/bolts/llmp.rs | 11 ++--------- afl/src/bolts/shmem.rs | 5 ++--- afl/src/corpus/mod.rs | 5 +---- afl/src/events/llmp.rs | 16 ++++++++-------- afl/src/events/logger.rs | 11 ++++------- afl/src/events/mod.rs | 16 +++++++++++----- afl/src/executors/inprocess.rs | 14 ++++++++++---- afl/src/mutators/mutations.rs | 16 +++------------- afl/src/observers/mod.rs | 1 - afl/src/state/mod.rs | 2 +- afl/src/stats/mod.rs | 2 +- fuzzers/libfuzzer_libpng/src/mod.rs | 6 +----- 12 files changed, 44 insertions(+), 61 deletions(-) diff --git a/afl/src/bolts/llmp.rs b/afl/src/bolts/llmp.rs index b3b6f5029f..4aa85d999b 100644 --- a/afl/src/bolts/llmp.rs +++ b/afl/src/bolts/llmp.rs @@ -1242,10 +1242,7 @@ where #[cfg(feature = "std")] /// Launches a thread using a tcp listener socket, on which new clients may connect to this broker /// Does so on the given port. - pub fn launch_tcp_listener_on( - &mut self, - port: u16, - ) -> Result, Error> { + pub fn launch_tcp_listener_on(&mut self, port: u16) -> Result, Error> { let listener = TcpListener::bind(format!("127.0.0.1:{}", port))?; // accept connections and process them, spawning a new thread for each one println!("Server listening on port {}", port); @@ -1332,11 +1329,7 @@ where /// broker broadcast to its own page for all others to read */ #[inline] - unsafe fn handle_new_msgs( - &mut self, - client_id: u32, - on_new_msg: &mut F, - ) -> Result<(), Error> + unsafe fn handle_new_msgs(&mut self, client_id: u32, on_new_msg: &mut F) -> Result<(), Error> where F: FnMut(u32, Tag, &[u8]) -> Result, { diff --git a/afl/src/bolts/shmem.rs b/afl/src/bolts/shmem.rs index 6b614a93ac..a560d5388d 100644 --- a/afl/src/bolts/shmem.rs +++ b/afl/src/bolts/shmem.rs @@ -34,8 +34,7 @@ pub trait ShMem: Sized + Debug { } /// Creates a nes variable with the given name, strigified to 20 bytes. - fn existing_from_shm_slice(map_str_bytes: &[u8; 20], map_size: usize) - -> Result; + fn existing_from_shm_slice(map_str_bytes: &[u8; 20], map_size: usize) -> Result; /// Initialize from a shm_str with fixed len of 20 fn existing_from_shm_str(shm_str: &str, map_size: usize) -> Result { @@ -324,7 +323,7 @@ pub mod shmem { mod tests { #[cfg(feature = "std")] - use super::{UnixShMem, ShMem}; + use super::{ShMem, UnixShMem}; #[cfg(feature = "std")] #[test] diff --git a/afl/src/corpus/mod.rs b/afl/src/corpus/mod.rs index ae04aaf5dd..659503a403 100644 --- a/afl/src/corpus/mod.rs +++ b/afl/src/corpus/mod.rs @@ -54,10 +54,7 @@ where /// Replaces the testcase at the given idx fn replace(&mut self, idx: usize, testcase: Testcase) -> Result<(), Error> { if self.entries_mut().len() < idx { - return Err(Error::KeyNotFound(format!( - "Index {} out of bounds", - idx - ))); + return Err(Error::KeyNotFound(format!("Index {} out of bounds", idx))); } self.entries_mut()[idx] = RefCell::new(testcase); Ok(()) diff --git a/afl/src/events/llmp.rs b/afl/src/events/llmp.rs index 81b9b7b579..867eaadb31 100644 --- a/afl/src/events/llmp.rs +++ b/afl/src/events/llmp.rs @@ -16,13 +16,13 @@ use crate::{ llmp::{self, LlmpClient, LlmpClientDescription, Tag}, shmem::ShMem, }, - executors::{HasObservers, Executor}, - observers::ObserversTuple, corpus::Corpus, events::{BrokerEventResult, Event, EventManager}, executors::ExitKind, + executors::{Executor, HasObservers}, feedbacks::FeedbacksTuple, inputs::Input, + observers::ObserversTuple, state::State, stats::Stats, utils::Rand, @@ -264,7 +264,7 @@ where R: Rand, OC: Corpus, OFT: FeedbacksTuple, - OT: ObserversTuple + OT: ObserversTuple, { match event { Event::NewTestcase { @@ -329,7 +329,7 @@ where R: Rand, OC: Corpus, OFT: FeedbacksTuple, - OT: ObserversTuple + OT: ObserversTuple, { // TODO: Get around local event copy by moving handle_in_client let mut events = vec![]; @@ -352,9 +352,9 @@ where } }; let count = events.len(); - events - .drain(..) - .try_for_each(|(sender_id, event)| self.handle_in_client(state, sender_id, event, executor))?; + events.drain(..).try_for_each(|(sender_id, event)| { + self.handle_in_client(state, sender_id, event, executor) + })?; Ok(count) } @@ -477,7 +477,7 @@ where R: Rand, OC: Corpus, OFT: FeedbacksTuple, - OT: ObserversTuple + OT: ObserversTuple, { self.llmp_mgr.process(state, executor) } diff --git a/afl/src/events/logger.rs b/afl/src/events/logger.rs index 7cf489bf61..5fe97054aa 100644 --- a/afl/src/events/logger.rs +++ b/afl/src/events/logger.rs @@ -5,10 +5,10 @@ use alloc::{string::ToString, vec::Vec}; use crate::{ corpus::Corpus, events::{BrokerEventResult, Event, EventManager}, - executors::{HasObservers, Executor}, - observers::ObserversTuple, + executors::{Executor, HasObservers}, feedbacks::FeedbacksTuple, inputs::Input, + observers::ObserversTuple, state::State, stats::Stats, utils::Rand, @@ -45,7 +45,7 @@ where R: Rand, OC: Corpus, OFT: FeedbacksTuple, - OT: ObserversTuple + OT: ObserversTuple, { let count = self.events.len(); while self.events.len() > 0 { @@ -88,10 +88,7 @@ where } // Handle arriving events in the broker - fn handle_in_broker( - stats: &mut ST, - event: &Event, - ) -> Result { + fn handle_in_broker(stats: &mut ST, event: &Event) -> Result { match event { Event::NewTestcase { input: _, diff --git a/afl/src/events/mod.rs b/afl/src/events/mod.rs index 38aed7d7cc..b44c8923a5 100644 --- a/afl/src/events/mod.rs +++ b/afl/src/events/mod.rs @@ -9,9 +9,14 @@ use core::{fmt, marker::PhantomData, time::Duration}; use serde::{Deserialize, Serialize}; use crate::{ - corpus::Corpus, feedbacks::FeedbacksTuple, inputs::Input, observers::ObserversTuple, - executors::{HasObservers, Executor}, - state::State, utils::Rand, Error, + corpus::Corpus, + executors::{Executor, HasObservers}, + feedbacks::FeedbacksTuple, + inputs::Input, + observers::ObserversTuple, + state::State, + utils::Rand, + Error, }; /// The log event severity @@ -266,7 +271,7 @@ where #[cfg(test)] mod tests { - use crate::bolts::tuples::{tuple_list}; + use crate::bolts::tuples::tuple_list; use crate::events::Event; use crate::inputs::bytes::BytesInput; use crate::observers::StdMapObserver; @@ -302,7 +307,8 @@ mod tests { time: _, executions: _, } => { - let o: tuple_list!(StdMapObserver::) = postcard::from_bytes(&observers_buf).unwrap(); + let o: tuple_list!(StdMapObserver::) = + postcard::from_bytes(&observers_buf).unwrap(); let test_observer = o.match_name_type::>("test").unwrap(); assert_eq!("test", test_observer.name()); } diff --git a/afl/src/executors/inprocess.rs b/afl/src/executors/inprocess.rs index fc91aaed6e..bbaa547864 100644 --- a/afl/src/executors/inprocess.rs +++ b/afl/src/executors/inprocess.rs @@ -293,13 +293,16 @@ pub mod unix_signals { if obj_fitness > 0 { if !state .add_if_objective(input.clone(), obj_fitness) - .expect("In crash handler objective corpus add failure.".into()).is_none() { + .expect("In crash handler objective corpus add failure.".into()) + .is_none() + { mgr.fire( state, Event::Objective { objective_size: state.objective_corpus().count(), }, - ) .expect(&format!("Could not send timeouting input {:?}", input)); + ) + .expect(&format!("Could not send timeouting input {:?}", input)); } } @@ -351,13 +354,16 @@ pub mod unix_signals { if obj_fitness > 0 { if !state .add_if_objective(input.clone(), obj_fitness) - .expect("In timeout handler objective corpus add failure.".into()).is_none() { + .expect("In timeout handler objective corpus add failure.".into()) + .is_none() + { mgr.fire( state, Event::Objective { objective_size: state.objective_corpus().count(), }, - ) .expect(&format!("Could not send timeouting input {:?}", input)); + ) + .expect(&format!("Could not send timeouting input {:?}", input)); } } diff --git a/afl/src/mutators/mutations.rs b/afl/src/mutators/mutations.rs index 50240ffd01..b0aae9489a 100644 --- a/afl/src/mutators/mutations.rs +++ b/afl/src/mutators/mutations.rs @@ -891,26 +891,16 @@ pub fn read_tokens_file(f: &str, tokens: &mut Vec>) -> Result x, - _ => { - return Err(Error::IllegalArgument( - "Illegal line: ".to_owned() + line, - )) - } + _ => return Err(Error::IllegalArgument("Illegal line: ".to_owned() + line)), }; if line.chars().nth(line.len() - 1) != Some('"') { - return Err(Error::IllegalArgument( - "Illegal line: ".to_owned() + line, - )); + return Err(Error::IllegalArgument("Illegal line: ".to_owned() + line)); } // extract item let item = match line.get(pos_quote + 1..line.len() - 1) { Some(x) => x, - _ => { - return Err(Error::IllegalArgument( - "Illegal line: ".to_owned() + line, - )) - } + _ => return Err(Error::IllegalArgument("Illegal line: ".to_owned() + line)), }; if item.len() == 0 { continue; diff --git a/afl/src/observers/mod.rs b/afl/src/observers/mod.rs index ee506ce7fb..09b126bb07 100644 --- a/afl/src/observers/mod.rs +++ b/afl/src/observers/mod.rs @@ -60,7 +60,6 @@ pub trait ObserversTuple: //fn for_each(&self, f: fn(&dyn Observer)); //fn for_each_mut(&mut self, f: fn(&mut dyn Observer)); - } impl ObserversTuple for () { diff --git a/afl/src/state/mod.rs b/afl/src/state/mod.rs index 91129e616e..983b556509 100644 --- a/afl/src/state/mod.rs +++ b/afl/src/state/mod.rs @@ -260,7 +260,7 @@ where pub fn objective_feedbacks_mut(&mut self) -> &mut OFT { &mut self.objective_feedbacks } - + /// Returns the objective corpus #[inline] pub fn objective_corpus(&self) -> &OC { diff --git a/afl/src/stats/mod.rs b/afl/src/stats/mod.rs index ba5fd97168..efd56de220 100644 --- a/afl/src/stats/mod.rs +++ b/afl/src/stats/mod.rs @@ -43,7 +43,7 @@ impl ClientStats { pub fn update_corpus_size(&mut self, corpus_size: u64) { self.corpus_size = corpus_size; } - + /// We got a new information about objective corpus size for this client, insert them. pub fn update_objective_size(&mut self, objective_size: u64) { self.objective_size = objective_size; diff --git a/fuzzers/libfuzzer_libpng/src/mod.rs b/fuzzers/libfuzzer_libpng/src/mod.rs index b40e22afb0..3c29bd3c74 100644 --- a/fuzzers/libfuzzer_libpng/src/mod.rs +++ b/fuzzers/libfuzzer_libpng/src/mod.rs @@ -68,11 +68,7 @@ pub fn main() { } /// The actual fuzzer -fn fuzz( - corpus_dirs: Vec, - objective_dir: PathBuf, - broker_port: u16, -) -> Result<(), Error> { +fn fuzz(corpus_dirs: Vec, objective_dir: PathBuf, broker_port: u16) -> Result<(), Error> { let mut rand = StdRand::new(afl::utils::current_nanos()); // 'While the stats are state, they are usually used in the broker - which is likely never restarted let stats = SimpleStats::new(|s| println!("{}", s));