SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
tokatoka 2021-12-24 15:46:27 +09:00
parent 9cd0d2228c
commit e6434d2ec2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libafl_frida/src/drcov_rt.rs
View File

@ -1,10 +1,9 @@
use std::hash::Hasher;
use ahash::AHasher; use ahash::AHasher;
use libafl::inputs::{HasTargetBytes, Input}; use libafl::inputs::{HasTargetBytes, Input};
use libafl_targets::drcov::{DrCovBasicBlock, DrCovWriter};
use libafl::Error; use libafl::Error;
use libafl_targets::drcov::{DrCovBasicBlock, DrCovWriter};
use rangemap::RangeMap; use rangemap::RangeMap;
use std::hash::Hasher;
pub struct DrCovRuntime { pub struct DrCovRuntime {
pub drcov_basic_blocks: Vec<DrCovBasicBlock>, pub drcov_basic_blocks: Vec<DrCovBasicBlock>,
@ -33,6 +32,4 @@ impl DrCovRuntime {
Ok(()) Ok(())
} }
}
}

8
libafl_frida/src/helper.rs
View File

@ -1,6 +1,6 @@
use libafl::inputs::{HasTargetBytes, Input}; use libafl::inputs::{HasTargetBytes, Input};
use libafl::Error; use libafl::Error;
use libafl_targets::drcov::{DrCovBasicBlock}; use libafl_targets::drcov::DrCovBasicBlock;
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
use capstone::{ use capstone::{
@ -113,7 +113,7 @@ impl<'a> FridaHelper<'a> for FridaInstrumentationHelper<'a> {
fn pre_exec<I: Input + HasTargetBytes>(&mut self, _input: &I) {} fn pre_exec<I: Input + HasTargetBytes>(&mut self, _input: &I) {}
#[cfg(unix)] #[cfg(unix)]
fn pre_exec<I: Input + HasTargetBytes>(&mut self, input: &I) -> Result<(), Error>{ fn pre_exec<I: Input + HasTargetBytes>(&mut self, input: &I) -> Result<(), Error> {
let target_bytes = input.target_bytes(); let target_bytes = input.target_bytes();
let slice = target_bytes.as_slice(); let slice = target_bytes.as_slice();
//println!("target_bytes: {:#x}: {:02x?}", slice.as_ptr() as usize, slice); //println!("target_bytes: {:#x}: {:02x?}", slice.as_ptr() as usize, slice);
@ -301,7 +301,9 @@ impl<'a> FridaInstrumentationHelper<'a> {
helper.asan_runtime.real_address_for_stalked(pc(&context)); helper.asan_runtime.real_address_for_stalked(pc(&context));
//let (range, (id, name)) = helper.ranges.get_key_value(&real_address).unwrap(); //let (range, (id, name)) = helper.ranges.get_key_value(&real_address).unwrap();
//println!("{}:0x{:016x}", name, real_address - range.start); //println!("{}:0x{:016x}", name, real_address - range.start);
helper.drcov_runtime.drcov_basic_blocks helper
.drcov_runtime
.drcov_basic_blocks
.push(DrCovBasicBlock::new(real_address, real_address + 4)); .push(DrCovBasicBlock::new(real_address, real_address + 4));
}); });
} }