Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor InProcessExecutor, merge timeout executors #1789

Merged
merged 104 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
047c392
move windows, inprocess fork to a different file, try new hook mechan…
tokatoka Jan 10, 2024
6ec89ce
fix
tokatoka Jan 11, 2024
4782df6
even more
tokatoka Jan 11, 2024
fc74ec0
more
tokatoka Jan 11, 2024
89eb38a
more
tokatoka Jan 11, 2024
6d7c08f
fix
tokatoka Jan 12, 2024
76c7080
fix
tokatoka Jan 12, 2024
fd4f661
macosgit add -ugit add -u
tokatoka Jan 12, 2024
a091f4b
windows!
tokatoka Jan 12, 2024
0f75463
windows!
tokatoka Jan 12, 2024
0709f93
aa
tokatoka Jan 12, 2024
c6f250f
aa
tokatoka Jan 12, 2024
2ec674a
macos
tokatoka Jan 12, 2024
f0c0fbc
std
tokatoka Jan 12, 2024
a2e2ae2
wtf unresolved?
tokatoka Jan 12, 2024
e0416d5
Copy, Clone
tokatoka Jan 12, 2024
1507896
why you just don't have the same API!
tokatoka Jan 12, 2024
5f14bff
inproc
tokatoka Jan 12, 2024
c69f367
next; inprocess
tokatoka Jan 12, 2024
cba8a81
windows?
tokatoka Jan 12, 2024
4da3ade
ci
tokatoka Jan 12, 2024
e55892c
ci
tokatoka Jan 12, 2024
7e59300
ci
tokatoka Jan 12, 2024
42e6369
unused
tokatoka Jan 12, 2024
c0bd738
ci
tokatoka Jan 12, 2024
c2974a8
unused
tokatoka Jan 12, 2024
4856b1d
no_std
tokatoka Jan 12, 2024
c4491f6
Merge branch 'main' of https://github.com/AFLplusplus/LibAFL into inp…
tokatoka Jan 12, 2024
11e95c0
Merge branch 'inproc_ref' of https://github.com/AFLplusplus/LibAFL in…
tokatoka Jan 12, 2024
9b61297
windows no std
tokatoka Jan 13, 2024
24b89dd
fix
tokatoka Jan 13, 2024
5d04b14
inprocess
tokatoka Jan 13, 2024
88c95fc
fix
tokatoka Jan 13, 2024
d4b786b
windows
tokatoka Jan 13, 2024
5c354ca
fuzzers
tokatoka Jan 13, 2024
c989e0d
macos , book
tokatoka Jan 13, 2024
8ffd858
fix
tokatoka Jan 13, 2024
ee80de5
aa
tokatoka Jan 13, 2024
334db4e
allow
tokatoka Jan 13, 2024
9cd3927
fix
tokatoka Jan 13, 2024
c62eefe
stop suggesting wrong lint AAAAAAAAAAAAAAAAA!!!
tokatoka Jan 14, 2024
aabc0ff
stop suggesting wrong lint AAAAAAAAAAAAAAAAA!!!
tokatoka Jan 14, 2024
6e1bf14
Merge branch 'main' into inproc_ref
tokatoka Jan 14, 2024
7723de3
win
tokatoka Jan 14, 2024
75968b4
fix
tokatoka Jan 14, 2024
bf6809a
wip
tokatoka Jan 15, 2024
caa0726
wip2
tokatoka Jan 15, 2024
6ade91d
windows done?
tokatoka Jan 15, 2024
6bdd738
Merge branch 'main' into inproc_ref
tokatoka Jan 17, 2024
2cdbc0b
remove TimeoutExecutor
tokatoka Jan 18, 2024
0d9726b
Merge branch 'inproc_ref' of github.com:AFLplusplus/LibAFL into inpro…
tokatoka Jan 18, 2024
60539d2
ci
tokatoka Jan 18, 2024
c57bedc
ci
tokatoka Jan 18, 2024
db94861
miri
tokatoka Jan 18, 2024
15fa5fa
fixfi
tokatoka Jan 18, 2024
8a4d4d0
compile on windows
tokatoka Jan 18, 2024
57b2a80
Merge branch 'main' of github.com:AFLplusplus/LibAFL into inproc_ref
tokatoka Jan 18, 2024
15cf451
a
tokatoka Jan 18, 2024
5199778
Merge branch 'inproc_ref' of github.com:AFLplusplus/LibAFL into inpro…
tokatoka Jan 18, 2024
25b176a
clp
tokatoka Jan 18, 2024
9a8f241
no_std stuff
tokatoka Jan 19, 2024
7ef3aad
windows no_std
tokatoka Jan 19, 2024
3949e9b
mac stuff
tokatoka Jan 19, 2024
8f72c06
Merge branch 'main' into inproc_ref
tokatoka Jan 19, 2024
c75cd9d
m
tokatoka Jan 19, 2024
292e53e
a
tokatoka Jan 19, 2024
663a0de
ci
tokatoka Jan 19, 2024
7eb20df
ci
tokatoka Jan 19, 2024
643d631
deleting timeoutexecutor, gradually
tokatoka Jan 19, 2024
8bf9af9
fucking macos
tokatoka Jan 19, 2024
c0f197a
ci
tokatoka Jan 19, 2024
db1af11
test
tokatoka Jan 19, 2024
e497254
ci
tokatoka Jan 19, 2024
58f785f
ci
tokatoka Jan 19, 2024
befeae4
batch mode constructor
tokatoka Jan 19, 2024
222b4e6
fix
tokatoka Jan 19, 2024
d50acf3
ci
tokatoka Jan 19, 2024
1e73d93
aa
tokatoka Jan 19, 2024
f384f1c
miri
tokatoka Jan 19, 2024
99d1d87
aaa
tokatoka Jan 19, 2024
37000b5
tmate again
tokatoka Jan 19, 2024
64d1cd4
fix windows stuff
tokatoka Jan 19, 2024
6b2d288
final fix
tokatoka Jan 19, 2024
20acc22
another win fix
tokatoka Jan 19, 2024
f8e300f
add
tokatoka Jan 19, 2024
4965c95
let's add the new fix later
tokatoka Jan 19, 2024
054007b
more
tokatoka Jan 19, 2024
eb01071
fi
tokatoka Jan 19, 2024
dd41bfd
parse
tokatoka Jan 20, 2024
f3bbc24
win clippy
tokatoka Jan 20, 2024
8c9e34a
win no std
tokatoka Jan 20, 2024
95babe2
safety
tokatoka Jan 20, 2024
f25159e
fix
tokatoka Jan 20, 2024
0677214
Merge branch 'inproc_ref' of github.com:AFLplusplus/LibAFL into inpro…
tokatoka Jan 20, 2024
4b6e2af
DEFAULT
tokatoka Jan 20, 2024
fbc1cfa
final fix
tokatoka Jan 21, 2024
4bf44f1
libafl_libfuzzer
tokatoka Jan 22, 2024
d67e6b5
comments
tokatoka Jan 22, 2024
d405208
fix
tokatoka Jan 23, 2024
45fe122
fix fuzzres
tokatoka Jan 23, 2024
9cf5fd6
fixxxxx
tokatoka Jan 23, 2024
3367eaa
fixxxxx
tokatoka Jan 23, 2024
6163ec4
last fix
tokatoka Jan 23, 2024
3dffea3
change name
tokatoka Jan 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/listings/baby_fuzzer/listing-04/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ fn main() {
/* ANCHOR: executor */
// Create the executor for an in-process function
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
(),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion docs/listings/baby_fuzzer/listing-05/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ fn main() {
/* ANCHOR: executor_with_observer */
// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion docs/listings/baby_fuzzer/listing-06/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion docs/src/advanced_features/frida.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ You can then link this observer to `FridaInProcessExecutor` as follows:
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
tuple_list!(
edges_observer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_gramatron/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_grimoire/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
2 changes: 0 additions & 2 deletions fuzzers/baby_fuzzer_minimizing/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ pub fn main() -> Result<(), Error> {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down Expand Up @@ -136,7 +135,6 @@ pub fn main() -> Result<(), Error> {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
(),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_multi/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(signals_observer, count_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_nautilus/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
2 changes: 0 additions & 2 deletions fuzzers/baby_fuzzer_swap_differential/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let first_executor = InProcessExecutor::new(
tuple_list!(),
&mut first_harness,
tuple_list!(first_map_observer),
&mut fuzzer,
Expand All @@ -229,7 +228,6 @@ pub fn main() {
)
.expect("Failed to create the first executor");
let second_executor = InProcessExecutor::new(
tuple_list!(),
&mut second_harness,
tuple_list!(second_map_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_tokens/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_unicode/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ pub fn fuzz() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_fuzzer_with_forkexecutor/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessForkExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/baby_no_std/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ pub extern "C" fn main(_argc: isize, _argv: *const *const u8) -> isize {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessForkExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer, bt_observer),
&mut fuzzer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer, bt_observer),
&mut fuzzer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessForkExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer, bt_observer),
&mut fuzzer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ pub fn main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer, bt_observer),
&mut fuzzer,
Expand Down
3 changes: 0 additions & 3 deletions fuzzers/frida_executable_libpng/src/fuzzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ unsafe fn fuzz(
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down Expand Up @@ -311,7 +310,6 @@ unsafe fn fuzz(
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down Expand Up @@ -442,7 +440,6 @@ unsafe fn fuzz(
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down
3 changes: 0 additions & 3 deletions fuzzers/frida_gdiplus/src/fuzzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down Expand Up @@ -305,7 +304,6 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down Expand Up @@ -437,7 +435,6 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down
3 changes: 0 additions & 3 deletions fuzzers/frida_libpng/src/fuzzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down Expand Up @@ -302,7 +301,6 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down Expand Up @@ -433,7 +431,6 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
let mut executor = FridaInProcessExecutor::new(
&gum,
InProcessExecutor::new(
tuple_list!(),
&mut frida_harness,
observers,
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/libafl_atheris/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ pub extern "C" fn LLVMFuzzerRunDriver(

// Setup a tracing stage in which we log comparisons
let tracing = TracingStage::new(InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(cmplog_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/libfuzzer_libmozjpeg/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ fn fuzz(corpus_dirs: &[PathBuf], objective_dir: PathBuf, broker_port: u16) -> Re

// Create the executor for an in-process function with observers for edge coverage, value-profile and allocations sizes
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(edges_observer, cmps_observer, allocs_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/libfuzzer_reachability/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ fn fuzz(corpus_dirs: &[PathBuf], objective_dir: PathBuf, broker_port: u16) -> Re

// Create the executor for an in-process function with one observer for edge coverage and one for the execution time
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(edges_observer, reachability_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/libfuzzer_stb_image/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ fn fuzz(corpus_dirs: &[PathBuf], objective_dir: PathBuf, broker_port: u16) -> Re
// Create the executor for an in-process function with just one observer for edge coverage
let mut executor = ShadowExecutor::new(
InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(edges_observer, time_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/libfuzzer_stb_image_concolic/fuzzer/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ fn fuzz(
// Create the executor for an in-process function with just one observer for edge coverage
let mut executor = ShadowExecutor::new(
InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(edges_observer, time_observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion fuzzers/nautilus_sync/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ pub extern "C" fn libafl_main() {

// Create the executor for an in-process function with just one observer
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(observer),
&mut fuzzer,
Expand Down
1 change: 0 additions & 1 deletion libafl/src/events/llmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1805,7 +1805,6 @@ mod tests {

let mut harness = |_buf: &BytesInput| ExitKind::Ok;
let mut executor = InProcessExecutor::new(
tuple_list!(),
&mut harness,
tuple_list!(),
&mut fuzzer,
Expand Down
Loading
Loading