Fix frida libafl after #1523 (#1560)

* Fix frida libpng after PR1523

* fmt

* Fix

* Clippy

libafl_frida/src/alloc.rs

@@ -225,7 +225,7 @@ impl Allocator {
 
         self.allocations
             .insert(metadata.address + self.page_size, metadata);
-        //log::trace!("serving address: {:?}, size: {:x}", address, size);
+        // log::trace!("serving address: {:?}, size: {:x}", address, size);
         address
     }
 
@@ -369,7 +369,7 @@ impl Allocator {
         end: usize,
         unpoison: bool,
     ) -> (usize, usize) {
-        //log::trace!("start: {:x}, end {:x}, size {:x}", start, end, end - start);
+        // log::trace!("start: {:x}, end {:x}, size {:x}", start, end, end - start);
 
         let shadow_mapping_start = map_to_shadow!(self, start);
 
@@ -400,7 +400,7 @@ impl Allocator {
             self.shadow_pages.insert(shadow_start..shadow_end);
         }
 
-        //log::trace!("shadow_mapping_start: {:x}, shadow_size: {:x}", shadow_mapping_start, (end - start) / 8);
+        // log::trace!("shadow_mapping_start: {:x}, shadow_size: {:x}", shadow_mapping_start, (end - start) / 8);
         if unpoison {
             Self::unpoison(shadow_mapping_start, end - start);
         }
@@ -446,31 +446,14 @@ impl Allocator {
             true
         });
     }
-}
 
-impl Default for Allocator {
+    /// Initialize the allocator, making sure a valid shadow bit is selected.
-    /// Creates a new [`Allocator`] (not supported on this platform!)
+    pub fn init(&mut self) {
-    #[cfg(not(any(
+        // probe to find a usable shadow bit:
-        target_os = "linux",
+        if self.shadow_bit != 0 {
-        target_vendor = "apple",
+            return;
-        all(target_arch = "aarch64", target_os = "android")
-    )))]
-    fn default() -> Self {
-        todo!("Shadow region not yet supported for this platform!");
         }
 
-    #[allow(clippy::too_many_lines)]
-    fn default() -> Self {
-        let ret = unsafe { sysconf(_SC_PAGESIZE) };
-        assert!(
-            ret >= 0,
-            "Failed to read pagesize {:?}",
-            io::Error::last_os_error()
-        );
-
-        #[allow(clippy::cast_sign_loss)]
-        let page_size = ret as usize;
-        // probe to find a usable shadow bit:
         let mut shadow_bit = 0;
 
         let mut occupied_ranges: Vec<(usize, usize)> = vec![];
@@ -487,7 +470,7 @@ impl Default for Allocator {
                 let start = details.memory_range().base_address().0 as usize;
                 let end = start + details.memory_range().size();
                 occupied_ranges.push((start, end));
-                // log::trace!("{:x} {:x}", start, end);
+                log::trace!("{:x} {:x}", start, end);
                 let base: usize = 2;
                 // On x64, if end > 2**48, then that's in vsyscall or something.
                 #[cfg(target_arch = "x86_64")]
@@ -523,7 +506,7 @@ impl Default for Allocator {
                 // check if the proposed shadow bit overlaps with occupied ranges.
                 for (start, end) in &occupied_ranges {
                     if (shadow_start <= *end) && (*start <= shadow_end) {
-                        // log::trace!("{:x} {:x}, {:x} {:x}",shadow_start,shadow_end,start,end);
+                        log::trace!("{:x} {:x}, {:x} {:x}", shadow_start, shadow_end, start, end);
                         log::warn!("shadow_bit {try_shadow_bit:x} is not suitable");
                         break;
                     }
@@ -532,7 +515,7 @@ impl Default for Allocator {
                 if unsafe {
                     mmap(
                         NonZeroUsize::new(addr),
-                        NonZeroUsize::new_unchecked(page_size),
+                        NonZeroUsize::new_unchecked(self.page_size),
                         ProtFlags::PROT_READ | ProtFlags::PROT_WRITE,
                         MapFlags::MAP_PRIVATE
                             | ANONYMOUS_FLAG
@@ -551,7 +534,7 @@ impl Default for Allocator {
         }
 
         log::warn!("shadow_bit {shadow_bit:x} is suitable");
-        assert!(shadow_bit != 0);
+        // assert!(shadow_bit != 0);
         // attempt to pre-map the entire shadow-memory space
 
         let addr: usize = 1 << shadow_bit;
@@ -570,22 +553,53 @@ impl Default for Allocator {
         }
         .is_ok();
 
+        self.pre_allocated_shadow = pre_allocated_shadow;
+        self.shadow_offset = 1 << shadow_bit;
+        self.shadow_bit = shadow_bit;
+        self.base_mapping_addr = addr + addr + addr;
+        self.current_mapping_addr = addr + addr + addr;
+    }
+}
+
+impl Default for Allocator {
+    /// Creates a new [`Allocator`] (not supported on this platform!)
+    #[cfg(not(any(
+        target_os = "linux",
+        target_vendor = "apple",
+        all(target_arch = "aarch64", target_os = "android")
+    )))]
+    fn default() -> Self {
+        todo!("Shadow region not yet supported for this platform!");
+    }
+
+    #[allow(clippy::too_many_lines)]
+    fn default() -> Self {
+        let ret = unsafe { sysconf(_SC_PAGESIZE) };
+        assert!(
+            ret >= 0,
+            "Failed to read pagesize {:?}",
+            io::Error::last_os_error()
+        );
+
+        #[allow(clippy::cast_sign_loss)]
+        let page_size = ret as usize;
+
         Self {
             max_allocation: 1 << 30,
             max_allocation_panics: false,
             max_total_allocation: 1 << 32,
             allocation_backtraces: false,
             page_size,
-            pre_allocated_shadow,
+            pre_allocated_shadow: false,
-            shadow_offset: 1 << shadow_bit,
+            shadow_offset: 0,
-            shadow_bit,
+            shadow_bit: 0,
             allocations: HashMap::new(),
             shadow_pages: RangeSet::new(),
             allocation_queue: BTreeMap::new(),
             largest_allocation: 0,
             total_allocation_size: 0,
-            base_mapping_addr: addr + addr + addr,
+            base_mapping_addr: 0,
-            current_mapping_addr: addr + addr + addr,
+            current_mapping_addr: 0,
         }
     }
 }

libafl_frida/src/asan/asan_rt.rs

@@ -171,6 +171,8 @@ impl FridaRuntime for AsanRuntime {
         _ranges: &RangeMap<usize, (u16, String)>,
         module_map: &Rc<ModuleMap>,
     ) {
+        self.allocator.init();
+
         unsafe {
             ASAN_ERRORS = Some(AsanErrors::new(self.continue_on_error));
         }

libafl_frida/src/helper.rs

@@ -245,7 +245,7 @@ impl FridaInstrumentationHelperBuilder {
     pub fn build<RT: FridaRuntimeTuple>(
         self,
         gum: &Gum,
-        mut runtimes: RT,
+        runtimes: RT,
     ) -> FridaInstrumentationHelper<'_, RT> {
         let Self {
             stalker_enabled,
@@ -266,32 +266,40 @@ impl FridaInstrumentationHelperBuilder {
         });
         let module_map = Rc::new(ModuleMap::new_with_filter(gum, &mut module_filter));
 
-        let mut ranges = RangeMap::new();
+        let ranges = RangeMap::new();
+        // Wrap ranges and runtimes in reference-counted refcells in order to move
+        // these references both into the struct that we return and the transformer callback
+        // that we pass to frida-gum.
+        //
+        // These moves MUST occur before the runtimes are init-ed
+        let ranges = Rc::new(RefCell::new(ranges));
+        let runtimes = Rc::new(RefCell::new(runtimes));
+
         if stalker_enabled {
             for (i, module) in module_map.values().iter().enumerate() {
                 let range = module.range();
                 let start = range.base_address().0 as usize;
-                ranges.insert(start..(start + range.size()), (i as u16, module.path()));
+                ranges
+                    .borrow_mut()
+                    .insert(start..(start + range.size()), (i as u16, module.path()));
             }
             for skip in skip_ranges {
                 match skip {
-                    SkipRange::Absolute(range) => ranges.remove(range),
+                    SkipRange::Absolute(range) => ranges.borrow_mut().remove(range),
                     SkipRange::ModuleRelative { name, range } => {
                         let module_details = ModuleDetails::with_name(name).unwrap();
                         let lib_start = module_details.range().base_address().0 as usize;
-                        ranges.remove((lib_start + range.start)..(lib_start + range.end));
+                        ranges
+                            .borrow_mut()
+                            .remove((lib_start + range.start)..(lib_start + range.end));
                     }
                 }
             }
-            runtimes.init_all(gum, &ranges, &module_map);
+            runtimes
+                .borrow_mut()
+                .init_all(gum, &ranges.borrow(), &module_map);
         }
 
-        // Wrap ranges and runtimes in reference-counted refcells in order to move
-        // these references both into the struct that we return and the transformer callback
-        // that we pass to frida-gum.
-        let ranges = Rc::new(RefCell::new(ranges));
-        let runtimes = Rc::new(RefCell::new(runtimes));
-
         let transformer = FridaInstrumentationHelper::build_transformer(gum, &ranges, &runtimes);
 
         #[cfg(unix)]
@@ -422,7 +430,7 @@ where
             .iter()
             .map(PathBuf::from)
             .collect::<Vec<_>>();
-        return FridaInstrumentationHelper::builder()
+        FridaInstrumentationHelper::builder()
             .enable_stalker(options.cmplog || options.asan || !options.disable_coverage)
             .disable_excludes(options.disable_excludes)
             .instrument_module_if(move |module| pathlist_contains_module(&harness, module))
@@ -435,7 +443,7 @@ where
                     range: *offset..*offset + 4,
                 }
             }))
-            .build(gum, runtimes);
+            .build(gum, runtimes)
     }
 
     #[allow(clippy::too_many_lines)]
@@ -487,7 +495,7 @@ where
             #[cfg(unix)]
             let instr_size = instr.bytes().len();
             let address = instr.address();
-            //log::trace!("block @ {:x} transformed to {:x}", address, output.writer().pc());
+            // log::trace!("block @ {:x} transformed to {:x}", address, output.writer().pc());
 
             if ranges.borrow().contains_key(&(address as usize)) {
                 let mut runtimes = (*runtimes).borrow_mut();