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
94 changes: 71 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "memflow-native"
version = "0.2.6"
authors = ["Aurimas Blažulionis <0x60@pm.me>", "ko1N <ko1N1337@gmail.com>"]
authors = ["Aurimas Blažulionis <0x60@pm.me>", "ko1N <ko1N1337@gmail.com>", "k1nd0ne <k1nd0ne@mail.com>"]
edition = "2021"
build = "build.rs"
description = "System call based proxy-OS for memflow"
Expand Down Expand Up @@ -47,7 +47,6 @@ windows = { version = "0.61", features = [
"Win32_UI_Input",
"Win32_UI_Input_KeyboardAndMouse",
] }

[target.'cfg(target_os = "macos")'.dependencies]
mac-sys-info = "0.1"
libproc = "0.14"
Expand Down
58 changes: 58 additions & 0 deletions src/linux/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,28 @@ impl LinuxProcess {
MMapPath::Other(s) => s.as_str().into(),
}
}

#[cfg(memflow_plugin_api = "2")]
fn collect_envars(&self) -> Result<Vec<EnvVarInfo>> {
let path = format!("/proc/{}/environ", self.pid);
let data = std::fs::read(path)
.map_err(|_| Error(ErrorOrigin::OsLayer, ErrorKind::EnvarNotFound))?;

let mut out = Vec::new();
for entry in data.split(|b| *b == 0).filter(|entry| !entry.is_empty()) {
let entry = String::from_utf8_lossy(entry);
if let Some((name, value)) = entry.split_once('=') {
out.push(EnvVarInfo {
name: ReprCString::from(name),
value: ReprCString::from(value),
address: Address::NULL,
arch: self.info.proc_arch,
});
}
}

Ok(out)
}
}

cglue_impl_group!(LinuxProcess, ProcessInstance, {});
Expand Down Expand Up @@ -276,6 +298,42 @@ impl Process for LinuxProcess {
}
}
}
#[cfg(memflow_plugin_api = "2")]
fn envar_list_callback(
&mut self,
target_arch: Option<&ArchitectureIdent>,
mut callback: EnvVarCallback,
) -> Result<()> {
if let Some(arch) = target_arch {
if *arch != self.info.proc_arch {
return Ok(());
}
}

for envar in self.collect_envars()? {
if !callback.call(envar) {
break;
}
}

Ok(())
}

#[cfg(memflow_plugin_api = "2")]
fn environment_block_address(&mut self, _architecture: ArchitectureIdent) -> Result<Address> {
// Linux does not expose a stable public env-block pointer through procfs.
Ok(Address::NULL)
}

#[cfg(memflow_plugin_api = "2")]
fn envar_list_from_address(
&mut self,
_env_block: Address,
architecture: ArchitectureIdent,
callback: EnvVarCallback,
) -> Result<()> {
self.envar_list_callback(Some(&architecture), callback)
}
}

impl MemoryView for LinuxProcess {
Expand Down
4 changes: 3 additions & 1 deletion src/macos/mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ fn get_task(pid: u32) -> Result<mach_port_t> {
let mut task = MACH_PORT_NULL;
let res = task_for_pid(mach_task_self(), pid as i32, &mut task as *mut mach_port_t);
if res != KERN_SUCCESS {
log::error!("Could not get task: {res}");
log::warn!(
"task_for_pid permission denied/unavailable for pid {pid} (kern_return={res})"
);
Err(Error(ErrorOrigin::OsLayer, ErrorKind::Unknown))
} else {
Ok(task)
Expand Down
Loading
Loading