Make Launcher use ClientDescription instead of CoreId

.github/workflows/build_and_test.yml

@@ -194,7 +194,7 @@ jobs:
   cargo-fmt:
     runs-on: ubuntu-24.04
     env:
-       MAIN_LLVM_VERSION: 19
+      MAIN_LLVM_VERSION: 19
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/ubuntu-prepare

fuzzers/binary_only/frida_executable_libpng/src/fuzzer.rs

@@ -5,7 +5,9 @@ use std::{path::PathBuf, ptr::null};
 use frida_gum::Gum;
 use libafl::{
     corpus::{CachedOnDiskCorpus, Corpus, OnDiskCorpus},
-    events::{launcher::Launcher, llmp::LlmpRestartingEventManager, EventConfig},
+    events::{
+        launcher::Launcher, llmp::LlmpRestartingEventManager, ClientDescription, EventConfig,
+    },
     executors::{inprocess::InProcessExecutor, ExitKind, ShadowExecutor},
     feedback_or, feedback_or_fast,
     feedbacks::{CrashFeedback, MaxMapFeedback, TimeFeedback, TimeoutFeedback},
@@ -93,13 +95,17 @@ unsafe fn fuzz(
 
     let shmem_provider = StdShMemProvider::new()?;
 
-    let mut run_client = |state: Option<_>, mgr: LlmpRestartingEventManager<_, _, _>, core_id| {
+    let mut run_client = |state: Option<_>,
+                          mgr: LlmpRestartingEventManager<_, _, _>,
+                          client_description: ClientDescription| {
         // The restarting state will spawn the same process again as child, then restarted it each time it crashes.
 
         // println!("{:?}", mgr.mgr_id());
 
-        if options.asan && options.asan_cores.contains(core_id) {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+        if options.asan && options.asan_cores.contains(client_description.core_id()) {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -222,9 +228,11 @@ unsafe fn fuzz(
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
-        } else if options.cmplog && options.cmplog_cores.contains(core_id) {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+            })(state, mgr, client_description)
+        } else if options.cmplog && options.cmplog_cores.contains(client_description.core_id()) {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -356,9 +364,11 @@ unsafe fn fuzz(
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
+            })(state, mgr, client_description)
         } else {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -473,7 +483,7 @@ unsafe fn fuzz(
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
+            })(state, mgr, client_description)
         }
     };
 

fuzzers/binary_only/frida_libpng/src/fuzzer.rs

@@ -5,7 +5,9 @@ use std::path::PathBuf;
 use frida_gum::Gum;
 use libafl::{
     corpus::{CachedOnDiskCorpus, Corpus, OnDiskCorpus},
-    events::{launcher::Launcher, llmp::LlmpRestartingEventManager, EventConfig},
+    events::{
+        launcher::Launcher, llmp::LlmpRestartingEventManager, ClientDescription, EventConfig,
+    },
     executors::{inprocess::InProcessExecutor, ExitKind, ShadowExecutor},
     feedback_or, feedback_or_fast,
     feedbacks::{CrashFeedback, MaxMapFeedback, TimeFeedback, TimeoutFeedback},
@@ -73,7 +75,9 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
 
     let shmem_provider = StdShMemProvider::new()?;
 
-    let mut run_client = |state: Option<_>, mgr: LlmpRestartingEventManager<_, _, _>, core_id| {
+    let mut run_client = |state: Option<_>,
+                          mgr: LlmpRestartingEventManager<_, _, _>,
+                          client_description: ClientDescription| {
         // The restarting state will spawn the same process again as child, then restarted it each time it crashes.
 
         // println!("{:?}", mgr.mgr_id());
@@ -90,8 +94,10 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
             ExitKind::Ok
         };
 
-        if options.asan && options.asan_cores.contains(core_id) {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+        if options.asan && options.asan_cores.contains(client_description.core_id()) {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -214,9 +220,11 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
-        } else if options.cmplog && options.cmplog_cores.contains(core_id) {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+            })(state, mgr, client_description)
+        } else if options.cmplog && options.cmplog_cores.contains(client_description.core_id()) {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -349,9 +357,11 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
+            })(state, mgr, client_description)
         } else {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -466,7 +476,7 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
+            })(state, mgr, client_description)
         }
     };
 

fuzzers/binary_only/frida_windows_gdiplus/src/fuzzer.rs

@@ -22,7 +22,9 @@ use std::path::PathBuf;
 use frida_gum::Gum;
 use libafl::{
     corpus::{CachedOnDiskCorpus, Corpus, OnDiskCorpus},
-    events::{launcher::Launcher, llmp::LlmpRestartingEventManager, EventConfig},
+    events::{
+        launcher::Launcher, llmp::LlmpRestartingEventManager, ClientDescription, EventConfig,
+    },
     executors::{inprocess::InProcessExecutor, ExitKind, ShadowExecutor},
     feedback_and_fast, feedback_or, feedback_or_fast,
     feedbacks::{ConstFeedback, CrashFeedback, MaxMapFeedback, TimeFeedback, TimeoutFeedback},
@@ -82,7 +84,9 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
 
     let shmem_provider = StdShMemProvider::new()?;
 
-    let mut run_client = |state: Option<_>, mgr: LlmpRestartingEventManager<_, _, _>, core_id| {
+    let mut run_client = |state: Option<_>,
+                          mgr: LlmpRestartingEventManager<_, _, _>,
+                          client_description: ClientDescription| {
         // The restarting state will spawn the same process again as child, then restarted it each time it crashes.
 
         // println!("{:?}", mgr.mgr_id());
@@ -99,8 +103,10 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
             ExitKind::Ok
         };
 
-        if options.asan && options.asan_cores.contains(core_id) {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+        if options.asan && options.asan_cores.contains(client_description.core_id()) {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -212,9 +218,11 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
-        } else if options.cmplog && options.cmplog_cores.contains(core_id) {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+            })(state, mgr, client_description)
+        } else if options.cmplog && options.cmplog_cores.contains(client_description.core_id()) {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -340,9 +348,11 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                 fuzzer.fuzz_loop(&mut stages, &mut executor, &mut state, &mut mgr)?;
 
                 Ok(())
-            })(state, mgr, core_id)
+            })(state, mgr, client_description)
         } else {
-            (|state: Option<_>, mut mgr: LlmpRestartingEventManager<_, _, _>, _core_id| {
+            (|state: Option<_>,
+              mut mgr: LlmpRestartingEventManager<_, _, _>,
+              _client_description| {
                 let gum = Gum::obtain();
 
                 let coverage = CoverageRuntime::new();
@@ -454,7 +464,7 @@ unsafe fn fuzz(options: &FuzzerOptions) -> Result<(), Error> {
                     .unwrap();
 
                 Ok(())
-            })(state, mgr, core_id)
+            })(state, mgr, client_description)
         }
     };