Skip to content

Commit

Permalink
Merge #1154
Browse files Browse the repository at this point in the history
1154: ptrace: add ptrace::seize for Linux r=asomers a=jsgf



Co-authored-by: Jeremy Fitzhardinge <[email protected]>
  • Loading branch information
bors[bot] and jsgf authored Nov 18, 2019
2 parents 5cb526d + a58d4eb commit 3c7a23b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased] - ReleaseDate
### Added
- Added `ptrace::seize()`: similar to `attach()` on Linux
but with better-defined semantics.
(#[1154](https://github.com/nix-rust/nix/pull/1154))

- Added `Signal::as_str()`: returns signal name as `&'static str`
(#[1138](https://github.com/nix-rust/nix/pull/1138))

Expand Down
15 changes: 15 additions & 0 deletions src/sys/ptrace/linux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,21 @@ pub fn attach(pid: Pid) -> Result<()> {
}
}

/// Attach to a running process, as with `ptrace(PTRACE_SEIZE, ...)`
///
/// Attaches to the process specified in pid, making it a tracee of the calling process.
#[cfg(all(target_os = "linux", not(any(target_arch = "mips", target_arch = "mips64"))))]
pub fn seize(pid: Pid, options: Options) -> Result<()> {
unsafe {
ptrace_other(
Request::PTRACE_SEIZE,
pid,
ptr::null_mut(),
options.bits() as *mut c_void,
).map(drop) // ignore the useless return value
}
}

/// Detaches the current running process, as with `ptrace(PTRACE_DETACH, ...)`
///
/// Detaches from the process specified in pid allowing it to run freely
Expand Down

0 comments on commit 3c7a23b

Please sign in to comment.