From c1ddcb2eed064c971b36d4ccafa048f27419cca0 Mon Sep 17 00:00:00 2001 From: Romain Malmain Date: Wed, 9 Oct 2024 11:13:43 +0200 Subject: [PATCH] Update frida to 0.14.0 (#2596) * update frida crate to the latest version * adapt libafl_frida to the latest version of frida --- fuzzers/binary_only/frida_executable_libpng/Cargo.toml | 2 +- fuzzers/binary_only/frida_gdiplus/Cargo.toml | 2 +- fuzzers/binary_only/frida_libpng/Cargo.toml | 2 +- libafl_frida/Cargo.toml | 4 ++-- libafl_frida/src/executor.rs | 2 +- libafl_frida/src/lib.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fuzzers/binary_only/frida_executable_libpng/Cargo.toml b/fuzzers/binary_only/frida_executable_libpng/Cargo.toml index 1dac28f409..56d438116f 100644 --- a/fuzzers/binary_only/frida_executable_libpng/Cargo.toml +++ b/fuzzers/binary_only/frida_executable_libpng/Cargo.toml @@ -25,7 +25,7 @@ libafl = { path = "../../../libafl", features = [ "frida_cli", ] } #, "llmp_small_maps", "llmp_debug"]} libafl_bolts = { path = "../../../libafl_bolts" } -frida-gum = { version = "0.13.7", features = [ +frida-gum = { version = "0.14.0", features = [ "auto-download", "event-sink", "invocation-listener", diff --git a/fuzzers/binary_only/frida_gdiplus/Cargo.toml b/fuzzers/binary_only/frida_gdiplus/Cargo.toml index b2efa111fe..139a49898b 100644 --- a/fuzzers/binary_only/frida_gdiplus/Cargo.toml +++ b/fuzzers/binary_only/frida_gdiplus/Cargo.toml @@ -23,7 +23,7 @@ libafl = { path = "../../../libafl", features = [ "errors_backtrace", ] } #, "llmp_small_maps", "llmp_debug"]} libafl_bolts = { path = "../../../libafl_bolts" } -frida-gum = { version = "0.13.7", features = [ +frida-gum = { version = "0.14.0", features = [ "auto-download", "event-sink", "invocation-listener", diff --git a/fuzzers/binary_only/frida_libpng/Cargo.toml b/fuzzers/binary_only/frida_libpng/Cargo.toml index efc3d2ff66..dd1ce4b950 100644 --- a/fuzzers/binary_only/frida_libpng/Cargo.toml +++ b/fuzzers/binary_only/frida_libpng/Cargo.toml @@ -26,7 +26,7 @@ libafl = { path = "../../../libafl", features = [ "errors_backtrace", ] } #, "llmp_small_maps", "llmp_debug"]} libafl_bolts = { path = "../../../libafl_bolts" } -frida-gum = { version = "0.13.7", features = [ +frida-gum = { version = "0.14.0", features = [ "auto-download", "event-sink", "invocation-listener", diff --git a/libafl_frida/Cargo.toml b/libafl_frida/Cargo.toml index 9a60f7a6f2..c7eb83ac38 100644 --- a/libafl_frida/Cargo.toml +++ b/libafl_frida/Cargo.toml @@ -73,11 +73,11 @@ nix = { workspace = true, default-features = true, features = ["mman"] } libc = { workspace = true } hashbrown = { workspace = true, default-features = true } rangemap = { workspace = true } -frida-gum-sys = { version = "0.13.7", features = [ +frida-gum-sys = { version = "0.14.0", features = [ "event-sink", "invocation-listener", ] } -frida-gum = { version = "0.13.7", features = [ +frida-gum = { version = "0.14.0", features = [ "event-sink", "invocation-listener", "module-names", diff --git a/libafl_frida/src/executor.rs b/libafl_frida/src/executor.rs index 474d641e8b..2514a99df4 100644 --- a/libafl_frida/src/executor.rs +++ b/libafl_frida/src/executor.rs @@ -41,7 +41,7 @@ where // thread_id for the Stalker thread_id: Option, /// Frida's dynamic rewriting engine - stalker: Stalker<'a>, + stalker: Stalker, /// User provided callback for instrumentation helper: &'c mut FridaInstrumentationHelper<'b, RT>, followed: bool, diff --git a/libafl_frida/src/lib.rs b/libafl_frida/src/lib.rs index 7bb987e662..74f757e5b3 100644 --- a/libafl_frida/src/lib.rs +++ b/libafl_frida/src/lib.rs @@ -575,7 +575,7 @@ mod tests { "Skipping test, {test_harness} not found" ); - GUM.set(unsafe { Gum::obtain() }) + GUM.set(Gum::obtain()) .unwrap_or_else(|_| panic!("Failed to initialize Gum")); let simulated_args = vec![ "libafl_frida_test",