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

add crash_exitcode to Forkserver to accomodate AFL_CRASH_EXITCODE (#2107)

Browse Source 
* add crash_exitcode to Forkserver to accomodate AFL_CRASH_EXITCODE

* make crash_exitcode i8

---------

Co-authored-by: aarnav <aarnav@srlabs.de>
This commit is contained in:
Aarnav 2024-04-26 07:24:25 -07:00 committed by GitHub
parent c2e0e8ddbe
commit 32963be453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,6 +498,7 @@ where
phantom: PhantomData<S>, phantom: PhantomData<S>,
map_size: Option<usize>, map_size: Option<usize>,
timeout: TimeSpec, timeout: TimeSpec,
crash_exitcode: Option<i8>,
} }
impl<OT, S, SP> Debug for ForkserverExecutor<OT, S, SP> impl<OT, S, SP> Debug for ForkserverExecutor<OT, S, SP>
@ -583,6 +584,7 @@ pub struct ForkserverExecutorBuilder<'a, SP> {
real_map_size: i32, real_map_size: i32,
kill_signal: Option<Signal>, kill_signal: Option<Signal>,
timeout: Option<Duration>, timeout: Option<Duration>,
crash_exitcode: Option<i8>,
} }
impl<'a, SP> ForkserverExecutorBuilder<'a, SP> { impl<'a, SP> ForkserverExecutorBuilder<'a, SP> {
@ -631,6 +633,7 @@ impl<'a, SP> ForkserverExecutorBuilder<'a, SP> {
phantom: PhantomData, phantom: PhantomData,
map_size: self.map_size, map_size: self.map_size,
timeout, timeout,
crash_exitcode: self.crash_exitcode,
}) })
} }
@ -688,6 +691,7 @@ impl<'a, SP> ForkserverExecutorBuilder<'a, SP> {
phantom: PhantomData, phantom: PhantomData,
map_size: self.map_size, map_size: self.map_size,
timeout, timeout,
crash_exitcode: self.crash_exitcode,
}) })
} }
@ -999,6 +1003,13 @@ impl<'a, SP> ForkserverExecutorBuilder<'a, SP> {
self self
} }
/// Treats an execution as a crash if the provided exitcode is returned
#[must_use]
pub fn crash_exitcode(mut self, exitcode: i8) -> Self {
self.crash_exitcode = Some(exitcode);
self
}
/// Call this if the harness uses deferred forkserver mode; default is false /// Call this if the harness uses deferred forkserver mode; default is false
#[must_use] #[must_use]
pub fn is_deferred_frksrv(mut self, is_deferred_frksrv: bool) -> Self { pub fn is_deferred_frksrv(mut self, is_deferred_frksrv: bool) -> Self {
@ -1047,6 +1058,7 @@ impl<'a> ForkserverExecutorBuilder<'a, UnixShMemProvider> {
max_input_size: MAX_INPUT_SIZE_DEFAULT, max_input_size: MAX_INPUT_SIZE_DEFAULT,
kill_signal: None, kill_signal: None,
timeout: None, timeout: None,
crash_exitcode: None,
} }
} }
@ -1072,6 +1084,7 @@ impl<'a> ForkserverExecutorBuilder<'a, UnixShMemProvider> {
max_input_size: MAX_INPUT_SIZE_DEFAULT, max_input_size: MAX_INPUT_SIZE_DEFAULT,
kill_signal: None, kill_signal: None,
timeout: None, timeout: None,
crash_exitcode: None,
} }
} }
} }
@ -1157,7 +1170,12 @@ where
if let Some(status) = self.forkserver.read_st_timed(&self.timeout)? { if let Some(status) = self.forkserver.read_st_timed(&self.timeout)? {
self.forkserver.set_status(status); self.forkserver.set_status(status);
if libc::WIFSIGNALED(self.forkserver().status()) { let exitcode_is_crash = if let Some(crash_exitcode) = self.crash_exitcode {
(libc::WEXITSTATUS(self.forkserver().status()) as i8) == crash_exitcode
} else {
false
};
if libc::WIFSIGNALED(self.forkserver().status()) || exitcode_is_crash {
exit_kind = ExitKind::Crash; exit_kind = ExitKind::Crash;
#[cfg(feature = "regex")] #[cfg(feature = "regex")]
if let Some(asan_observer) = self if let Some(asan_observer) = self