diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-11-08 05:05:49 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-11-08 05:05:49 +0000 |
commit | d54d874a8d10e177fb90cf8c3b8a85238ec9edb8 (patch) | |
tree | 05a3558d6816ac1c0a1000c1adfc36f8ebf3455b | |
parent | 6a2feaa98fc110700b3a10d3808bb8526d7d1fb9 (diff) | |
parent | 313d2e3b809f756686d9423d4204efe3b317c84d (diff) | |
download | nix-d54d874a8d10e177fb90cf8c3b8a85238ec9edb8.zip |
Merge #771
771: ptrace: add PTRACE_O_EXITKILL option r=Susurrus a=bpowers
It is a somewhat newer option -- it requires Linux 3.8. Is there a
more precise way to specify that?
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | src/sys/ptrace.rs | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 13a7104b..0f2d0754 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ([#768](https:://github.com/nix-rust/nix/pull/768)) - Added `nix::unistd::mkfifo`. ([#602](https://github.com/nix-rust/nix/pull/774)) +- Added `ptrace::Options::PTRACE_O_EXITKILL` on Linux and Android. + ([#771](https://github.com/nix-rust/nix/pull/771)) ### Changed - Renamed existing `ptrace` wrappers to encourage namespacing ([#692](https://github.com/nix-rust/nix/pull/692)) diff --git a/src/sys/ptrace.rs b/src/sys/ptrace.rs index 64b523c3..43a78862 100644 --- a/src/sys/ptrace.rs +++ b/src/sys/ptrace.rs @@ -116,6 +116,10 @@ libc_bitflags! { /// Stop tracee when a SECCOMP_RET_TRACE rule is triggered. See `man seccomp` for more /// details. PTRACE_O_TRACESECCOMP; + /// Send a SIGKILL to the tracee if the tracer exits. This is useful + /// for ptrace jailers to prevent tracees from escaping their control. + #[cfg(any(target_os = "android", target_os = "linux"))] + PTRACE_O_EXITKILL; } } |