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

fix(libafl_frida): enable asan for Android x86_64 (#1578)

Browse Source
This commit is contained in:
Abc Xyz 2023-09-30 00:10:27 +03:00 committed by GitHub
parent 6f67919622
commit 0932421020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libafl_frida/src/alloc.rs
View File

@ -1,7 +1,10 @@
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_vendor = "apple", target_vendor = "apple",
all(target_arch = "aarch64", target_os = "android") all(
any(target_arch = "aarch64", target_arch = "x86_64"),
target_os = "android"
)
))] ))]
use std::{collections::BTreeMap, ffi::c_void}; use std::{collections::BTreeMap, ffi::c_void};
@ -12,7 +15,10 @@ use libafl_bolts::cli::FuzzerOptions;
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_vendor = "apple", target_vendor = "apple",
all(target_arch = "aarch64", target_os = "android") all(
any(target_arch = "aarch64", target_arch = "x86_64"),
target_os = "android"
)
))] ))]
use mmap_rs::{MemoryAreas, MmapFlags, MmapMut, MmapOptions, ReservedMut}; use mmap_rs::{MemoryAreas, MmapFlags, MmapMut, MmapOptions, ReservedMut};
use nix::libc::memset; use nix::libc::memset;
@ -85,7 +91,10 @@ impl Allocator {
windows, windows,
target_os = "linux", target_os = "linux",
target_vendor = "apple", target_vendor = "apple",
all(target_arch = "aarch64", target_os = "android") all(
any(target_arch = "aarch64", target_arch = "x86_64"),
target_os = "android"
)
)))] )))]
#[must_use] #[must_use]
pub fn new(_: FuzzerOptions) -> Self { pub fn new(_: FuzzerOptions) -> Self {
@ -97,7 +106,10 @@ impl Allocator {
windows, windows,
target_os = "linux", target_os = "linux",
target_vendor = "apple", target_vendor = "apple",
all(target_arch = "aarch64", target_os = "android") all(
any(target_arch = "aarch64", target_arch = "x86_64"),
target_os = "android"
)
))] ))]
#[must_use] #[must_use]
pub fn new(options: &FuzzerOptions) -> Self { pub fn new(options: &FuzzerOptions) -> Self {
@ -559,7 +571,10 @@ impl Default for Allocator {
windows, windows,
target_os = "linux", target_os = "linux",
target_vendor = "apple", target_vendor = "apple",
all(target_arch = "aarch64", target_os = "android") all(
any(target_arch = "aarch64", target_arch = "x86_64"),
target_os = "android"
)
)))] )))]
fn default() -> Self { fn default() -> Self {
todo!("Shadow region not yet supported for this platform!"); todo!("Shadow region not yet supported for this platform!");