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

Adding fork feature passing from libafl_qemu to libafl crate (#806)

Browse Source 
* Adding fork feature passing from libafl_qemu to libafl crate

* Removing patches from a different PR

* Adding fork as a default feature for libafl_qemu

* Removing rand_trait feature from libafl_qemu
This commit is contained in:
Patrick Gersch 2022-09-30 20:29:54 +02:00 committed by GitHub
parent cc0c2f32ae
commit 02c962de45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libafl_qemu/Cargo.toml
View File

@ -12,8 +12,9 @@ edition = "2021"
categories = ["development-tools::testing", "emulators", "embedded", "os", "no-std"]
[features]
default = ["usermode"]
default = ["usermode", "fork"]
python = ["pyo3", "pyo3-build-config"]
fork = ["libafl/fork"]
# The following architecture features are mutually exclusive.
x86_64 = [] # build qemu for x86_64 (default)
@ -27,7 +28,7 @@ usermode = []
clippy = [] # special feature for clippy, don't use in normal projects§
[dependencies]
libafl = { path = "../libafl", version = "0.8.1" }
libafl = { path = "../libafl", version = "0.8.1", default-features = false, features = ["std", "derive", "llmp_compression"] }
libafl_targets = { path = "../libafl_targets", version = "0.8.1" }
serde = { version = "1.0", default-features = false, features = ["alloc"] } # serialization lib

9
libafl_qemu/src/executor.rs
View File

@ -1,10 +1,12 @@
//! A `QEMU`-based executor for binary-only instrumentation in `LibAFL`
use core::fmt::{self, Debug, Formatter};
#[cfg(feature = "fork")]
use libafl::executors::InProcessForkExecutor;
use libafl::{
bolts::shmem::ShMemProvider,
events::{EventFirer, EventRestarter},
executors::{Executor, ExitKind, HasObservers, InProcessExecutor, InProcessForkExecutor},
executors::{Executor, ExitKind, HasObservers, InProcessExecutor},
feedbacks::Feedback,
fuzzer::HasObjective,
inputs::Input,
@ -130,6 +132,7 @@ where
}
}
#[cfg(feature = "fork")]
pub struct QemuForkExecutor<'a, H, I, OT, QT, S, SP>
where
H: FnMut(&I) -> ExitKind,
@ -142,6 +145,7 @@ where
inner: InProcessForkExecutor<'a, H, I, OT, S, SP>,
}
#[cfg(feature = "fork")]
impl<'a, H, I, OT, QT, S, SP> Debug for QemuForkExecutor<'a, H, I, OT, QT, S, SP>
where
H: FnMut(&I) -> ExitKind,
@ -158,6 +162,7 @@ where
}
}
#[cfg(feature = "fork")]
impl<'a, H, I, OT, QT, S, SP> QemuForkExecutor<'a, H, I, OT, QT, S, SP>
where
H: FnMut(&I) -> ExitKind,
@ -217,6 +222,7 @@ where
}
}
#[cfg(feature = "fork")]
impl<'a, EM, H, I, OT, QT, S, Z, SP> Executor<EM, I, S, Z>
for QemuForkExecutor<'a, H, I, OT, QT, S, SP>
where
@ -241,6 +247,7 @@ where
}
}
#[cfg(feature = "fork")]
impl<'a, H, I, OT, QT, S, SP> HasObservers<I, OT, S> for QemuForkExecutor<'a, H, I, OT, QT, S, SP>
where
H: FnMut(&I) -> ExitKind,

4
libafl_qemu/src/lib.rs
View File

@ -62,7 +62,9 @@ pub use asan::{init_with_asan, QemuAsanHelper};
pub mod calls;
pub mod executor;
pub use executor::{QemuExecutor, QemuForkExecutor};
pub use executor::QemuExecutor;
#[cfg(feature = "fork")]
pub use executor::QemuForkExecutor;
pub mod emu;
pub use emu::*;