Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ext/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
mod mapping;
pub mod read;
pub mod search;
pub mod write;
20 changes: 10 additions & 10 deletions src/ext/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 1];
Expand All @@ -56,7 +56,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 2];
Expand All @@ -77,7 +77,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;
let mut buffer = [0u8; 4];
file.read_exact(&mut buffer)?;
Expand All @@ -98,7 +98,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 8];
Expand All @@ -119,7 +119,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 1];
Expand All @@ -140,7 +140,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 2];
Expand All @@ -161,7 +161,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 4];
Expand All @@ -183,7 +183,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 8];
Expand All @@ -204,7 +204,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 4];
Expand All @@ -226,7 +226,7 @@ impl ReadExt for crate::prelude::Process {
let _ = ptrace::detach(Pid::from_raw(self.pid), None);
}

let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;
file.seek(io::SeekFrom::Start(address as u64))?;

let mut buffer = [0u8; 8];
Expand Down
18 changes: 13 additions & 5 deletions src/ext/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::ext::mapping::MappingExtError;
pub trait SearchExt {
/// Search for a byte pattern and return memory addresses.
fn search_bytes(&self, pattern: &[u8]) -> SearchExtResult<Vec<usize>>;
fn search_u8(&self, value: u8) -> SearchExtResult<Vec<usize>>;
fn search_u8(&self, value: u8, byte_order: Option<ByteOrder>) -> SearchExtResult<Vec<usize>>;
fn search_u16(&self, value: u16, byte_order: Option<ByteOrder>) -> SearchExtResult<Vec<usize>>;
fn search_u32(&self, value: u32, byte_order: Option<ByteOrder>) -> SearchExtResult<Vec<usize>>;
#[cfg(target_pointer_width = "64")]
Expand Down Expand Up @@ -47,7 +47,7 @@ impl SearchExt for crate::prelude::Process {
}

let mappings = self.mappings()?;
let mut file = self.mem_file()?;
let mut file = self.mem_file(false)?;

const BUFFER_SIZE: usize = 8192;
let mut buffer = [0u8; BUFFER_SIZE];
Expand Down Expand Up @@ -149,8 +149,14 @@ impl SearchExt for crate::prelude::Process {
Ok(addresses)
}

fn search_u8(&self, value: u8) -> SearchExtResult<Vec<usize>> {
self.search_bytes(&[value])
fn search_u8(&self, value: u8, byte_order: Option<ByteOrder>) -> SearchExtResult<Vec<usize>> {
self.search_bytes(
&(match byte_order {
Some(ByteOrder::BigEndian) => value.to_be_bytes(),
Some(ByteOrder::LittleEndian) => value.to_le_bytes(),
None => value.to_ne_bytes(),
}),
)
}

fn search_u16(&self, value: u16, byte_order: Option<ByteOrder>) -> SearchExtResult<Vec<usize>> {
Expand Down Expand Up @@ -344,7 +350,9 @@ mod linux_tests {
fn test_search_u8(dummy_process: DummyProcess) {
let process =
Process::try_new(dummy_process.pid).expect("Could not get dummy process with id.");
let addresses = process.search_u8(2).expect("Could not search u8 value.");
let addresses = process
.search_u8(2, None)
.expect("Could not search u8 value.");

let target_address: usize = {
let response =
Expand Down
Loading