SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forkserver_simple uses TimeoutForkserverExecutor (#139)

Browse Source 
* forkserver_simple uses TimeoutforkserverExecutor

* fmt

* from_millis
This commit is contained in:
Toka 2021-05-31 22:44:56 +09:00 committed by GitHub
parent e68eaf8244
commit e4b3cc542a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fuzzers/forkserver_simple/src/main.rs
View File

@ -1,5 +1,4 @@
use std::path::PathBuf; use core::time::Duration;
use libafl::{ use libafl::{
bolts::{ bolts::{
current_nanos, current_nanos,
@ -12,7 +11,7 @@ use libafl::{
QueueCorpusScheduler, QueueCorpusScheduler,
}, },
events::SimpleEventManager, events::SimpleEventManager,
executors::forkserver::ForkserverExecutor, executors::forkserver::{ForkserverExecutor, TimeoutForkserverExecutor},
feedback_and, feedback_or, feedback_and, feedback_or,
feedbacks::{CrashFeedback, MapFeedbackState, MaxMapFeedback, TimeFeedback}, feedbacks::{CrashFeedback, MapFeedbackState, MaxMapFeedback, TimeFeedback},
fuzzer::{Fuzzer, StdFuzzer}, fuzzer::{Fuzzer, StdFuzzer},
@ -23,6 +22,7 @@ use libafl::{
state::{HasCorpus, StdState}, state::{HasCorpus, StdState},
stats::SimpleStats, stats::SimpleStats,
}; };
use std::path::PathBuf;
#[allow(clippy::similar_names)] #[allow(clippy::similar_names)]
pub fn main() { pub fn main() {
@ -96,12 +96,16 @@ pub fn main() {
let mut fuzzer = StdFuzzer::new(scheduler, feedback, objective); let mut fuzzer = StdFuzzer::new(scheduler, feedback, objective);
// Create the executor for the forkserver // Create the executor for the forkserver
let mut executor = ForkserverExecutor::new( let mut executor = TimeoutForkserverExecutor::new(
"../../libafl_tests/src/forkserver_test.o".to_string(), ForkserverExecutor::new(
&[], "../../libafl_tests/src/forkserver_test.o".to_string(),
tuple_list!(edges_observer, time_observer), &[],
tuple_list!(edges_observer, time_observer),
)
.unwrap(),
Duration::from_millis(5000),
) )
.expect("Failed to create the Executor"); .expect("Failed to create the executor.");
// In case the corpus is empty (on first run), reset // In case the corpus is empty (on first run), reset
if state.corpus().count() < 1 { if state.corpus().count() < 1 {

4
libafl/src/executors/forkserver.rs
View File

@ -389,8 +389,8 @@ where
// We need to kill the child in case he has timed out, or we can't get the correct pid in the next call to self.executor.forkserver_mut().read_st()? // We need to kill the child in case he has timed out, or we can't get the correct pid in the next call to self.executor.forkserver_mut().read_st()?
kill(self.executor.forkserver().child_pid(), Signal::SIGKILL)?; kill(self.executor.forkserver().child_pid(), Signal::SIGKILL)?;
let (recv_status_len, exit_code) = self.executor.forkserver_mut().read_st()?; let (recv_status_len, _) = self.executor.forkserver_mut().read_st()?;
if recv_status_len != 4 || exit_code != 9 { if recv_status_len != 4 {
return Err(Error::Forkserver( return Err(Error::Forkserver(
"Could not kill timed-out child".to_string(), "Could not kill timed-out child".to_string(),
)); ));