From 268cda19c7687b944b3a3464a718e3854aff2501 Mon Sep 17 00:00:00 2001 From: Toka Date: Tue, 12 Nov 2024 17:25:20 +0100 Subject: [PATCH 1/5] No Usermode default --- libafl_qemu/Cargo.toml | 1 - libafl_qemu/libafl_qemu_sys/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libafl_qemu/Cargo.toml b/libafl_qemu/Cargo.toml index 8c5d38320e..b5fe0b1ff2 100644 --- a/libafl_qemu/Cargo.toml +++ b/libafl_qemu/Cargo.toml @@ -23,7 +23,6 @@ rustdoc-args = ["--cfg", "docsrs"] [features] default = [ - "usermode", "fork", "build_libgasan", "build_libqasan", diff --git a/libafl_qemu/libafl_qemu_sys/Cargo.toml b/libafl_qemu/libafl_qemu_sys/Cargo.toml index 502ff3d110..1fcbdd26de 100644 --- a/libafl_qemu/libafl_qemu_sys/Cargo.toml +++ b/libafl_qemu/libafl_qemu_sys/Cargo.toml @@ -23,7 +23,7 @@ features = ["x86_64", "usermode"] rustdoc-args = ["--cfg", "docsrs"] [features] -default = ["usermode", "x86_64"] +default = ["x86_64"] # The following architecture features are mutually exclusive. x86_64 = [] # build qemu for x86_64 From 31d53384266e0f750a1f2d1f2c69110019795d3c Mon Sep 17 00:00:00 2001 From: Toka Date: Tue, 12 Nov 2024 18:30:27 +0100 Subject: [PATCH 2/5] no tui --- libafl/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml index 3bfda935bc..2b9c53ed64 100644 --- a/libafl/Cargo.toml +++ b/libafl/Cargo.toml @@ -37,7 +37,6 @@ default = [ "gzip", "regex", "serdeany_autoreg", - "tui_monitor", "libafl_bolts/xxh3", ] document-features = ["dep:document-features"] From c385ca500f5200f8c8c22255a5f235aa8e13d96a Mon Sep 17 00:00:00 2001 From: Toka Date: Tue, 12 Nov 2024 18:54:42 +0100 Subject: [PATCH 3/5] gg --- fuzzers/baby/baby_fuzzer/Cargo.toml | 2 +- fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml | 2 +- fuzzers/baby/baby_fuzzer_unicode/Cargo.toml | 2 +- fuzzers/binary_only/qemu_launcher/Cargo.toml | 5 ++++- fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml | 2 +- fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml | 5 ++++- libafl_qemu/Cargo.toml | 1 + libafl_qemu/libafl_qemu_sys/Cargo.toml | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/fuzzers/baby/baby_fuzzer/Cargo.toml b/fuzzers/baby/baby_fuzzer/Cargo.toml index ca3931fed3..f67c2c3ac0 100644 --- a/fuzzers/baby/baby_fuzzer/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer/Cargo.toml @@ -23,6 +23,6 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl" } +libafl = { path = "../../../libafl", features = ["tui_monitor"] } libafl_bolts = { path = "../../../libafl_bolts" } log = { version = "0.4.22", features = ["release_max_level_info"] } diff --git a/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml index a9f50b37b5..564ce6a315 100644 --- a/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml @@ -25,7 +25,7 @@ bindgen = "0.70.1" cc = "1.1.21" [dependencies] -libafl = { path = "../../../libafl" } +libafl = { path = "../../../libafl", features = ["tui_monitor"] } libafl_bolts = { path = "../../../libafl_bolts" } libafl_targets = { path = "../../../libafl_targets", features = [ "sancov_pcguard_hitcounts", diff --git a/fuzzers/baby/baby_fuzzer_unicode/Cargo.toml b/fuzzers/baby/baby_fuzzer_unicode/Cargo.toml index 2a7df6f019..61a1366659 100644 --- a/fuzzers/baby/baby_fuzzer_unicode/Cargo.toml +++ b/fuzzers/baby/baby_fuzzer_unicode/Cargo.toml @@ -23,6 +23,6 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl", features = ["unicode"] } +libafl = { path = "../../../libafl", features = ["unicode", "tui_monitor"] } libafl_bolts = { path = "../../../libafl_bolts" } log = { version = "0.4.22", features = ["release_max_level_info"] } diff --git a/fuzzers/binary_only/qemu_launcher/Cargo.toml b/fuzzers/binary_only/qemu_launcher/Cargo.toml index e49f9d227a..7fb064b982 100644 --- a/fuzzers/binary_only/qemu_launcher/Cargo.toml +++ b/fuzzers/binary_only/qemu_launcher/Cargo.toml @@ -46,7 +46,10 @@ libafl = { path = "../../../libafl" } libafl_bolts = { path = "../../../libafl_bolts", features = [ "errors_backtrace", ] } -libafl_qemu = { path = "../../../libafl_qemu", features = ["usermode"] } +libafl_qemu = { path = "../../../libafl_qemu", features = [ + "usermode", + "tui_monitor", +] } libafl_targets = { path = "../../../libafl_targets" } log = { version = "0.4.22", features = ["release_max_level_info"] } nix = { version = "0.29.0", features = ["fs"] } diff --git a/fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml b/fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml index e09c4e39bf..6a8716c134 100644 --- a/fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml +++ b/fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" default-run = "nyx_libxml2_standalone" [dependencies] -libafl = { path = "../../../libafl" } +libafl = { path = "../../../libafl", features = ["tui_monitor"] } libafl_bolts = { path = "../../../libafl_bolts" } libafl_cc = { path = "../../../libafl_cc" } libafl_nyx = { path = "../../../libafl_nyx" } diff --git a/fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml index b51ebf91bb..c349257686 100644 --- a/fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml +++ b/fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml @@ -24,6 +24,9 @@ opt-level = 3 debug = true [dependencies] -libafl = { path = "../../../libafl", features = ["multipart_inputs"] } +libafl = { path = "../../../libafl", features = [ + "multipart_inputs", + "tui_monitor", +] } libafl_bolts = { path = "../../../libafl_bolts" } log = { version = "0.4.22", features = ["release_max_level_info"] } diff --git a/libafl_qemu/Cargo.toml b/libafl_qemu/Cargo.toml index b5fe0b1ff2..8c5d38320e 100644 --- a/libafl_qemu/Cargo.toml +++ b/libafl_qemu/Cargo.toml @@ -23,6 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"] [features] default = [ + "usermode", "fork", "build_libgasan", "build_libqasan", diff --git a/libafl_qemu/libafl_qemu_sys/Cargo.toml b/libafl_qemu/libafl_qemu_sys/Cargo.toml index 1fcbdd26de..502ff3d110 100644 --- a/libafl_qemu/libafl_qemu_sys/Cargo.toml +++ b/libafl_qemu/libafl_qemu_sys/Cargo.toml @@ -23,7 +23,7 @@ features = ["x86_64", "usermode"] rustdoc-args = ["--cfg", "docsrs"] [features] -default = ["x86_64"] +default = ["usermode", "x86_64"] # The following architecture features are mutually exclusive. x86_64 = [] # build qemu for x86_64 From 0de950edfbd9272f4c4b91d8d39c9fd1abe5584e Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Tue, 12 Nov 2024 22:46:12 -0300 Subject: [PATCH 4/5] try fix CI --- fuzzers/binary_only/qemu_launcher/Cargo.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fuzzers/binary_only/qemu_launcher/Cargo.toml b/fuzzers/binary_only/qemu_launcher/Cargo.toml index 7fb064b982..2e466a0f8c 100644 --- a/fuzzers/binary_only/qemu_launcher/Cargo.toml +++ b/fuzzers/binary_only/qemu_launcher/Cargo.toml @@ -42,14 +42,11 @@ vergen-git2 = "1.0.1" [dependencies] clap = { version = "4.5.18", features = ["derive", "string"] } -libafl = { path = "../../../libafl" } +libafl = { path = "../../../libafl", features = ["tui_monitor"] } libafl_bolts = { path = "../../../libafl_bolts", features = [ "errors_backtrace", ] } -libafl_qemu = { path = "../../../libafl_qemu", features = [ - "usermode", - "tui_monitor", -] } +libafl_qemu = { path = "../../../libafl_qemu", features = ["usermode"] } libafl_targets = { path = "../../../libafl_targets" } log = { version = "0.4.22", features = ["release_max_level_info"] } nix = { version = "0.29.0", features = ["fs"] } From 1443445fb3484f8910a436689e9515926c37adc1 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Tue, 12 Nov 2024 22:52:50 -0300 Subject: [PATCH 5/5] fmt --- libafl_nyx/src/helper.rs | 8 +++++++- utils/cfg_builder/build.py | 1 - utils/gramatron/construct_automata.py | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libafl_nyx/src/helper.rs b/libafl_nyx/src/helper.rs index 40dd454d99..46673725be 100644 --- a/libafl_nyx/src/helper.rs +++ b/libafl_nyx/src/helper.rs @@ -71,7 +71,13 @@ impl NyxHelper { let mut timeout = Duration::from_secs(u64::from(settings.timeout_secs)); timeout += Duration::from_micros(u64::from(settings.timeout_micro_secs)); - Ok(Self { nyx_process, nyx_stdout, timeout, bitmap_size, bitmap_buffer }) + Ok(Self { + nyx_process, + nyx_stdout, + timeout, + bitmap_size, + bitmap_buffer, + }) } /// Set a timeout for Nyx. diff --git a/utils/cfg_builder/build.py b/utils/cfg_builder/build.py index 0d60fb6a55..e4664549e4 100644 --- a/utils/cfg_builder/build.py +++ b/utils/cfg_builder/build.py @@ -32,7 +32,6 @@ # First, add all the intra-procedural edges for fname, v in module["edges"].items(): - if fname not in fname2id: GG.add_node(f_ids, label=fname) fname2id[fname] = f_ids diff --git a/utils/gramatron/construct_automata.py b/utils/gramatron/construct_automata.py index 126b3f84e8..9f8441b47c 100644 --- a/utils/gramatron/construct_automata.py +++ b/utils/gramatron/construct_automata.py @@ -219,7 +219,6 @@ def postprocess1(): # Cull transitions to states which were not expanded owing to the stack limit if stack_limit: - blocklist = [] for final_state in final: for transition in pda: @@ -287,7 +286,6 @@ def postprocess(): # Cull transitions to states which were not expanded owing to the stack limit if stack_limit: - blocklist = [] for final_state in final: for transition in pda: