ptrace: implement getsyscallinfo #2006

mbyzhang · 2023-02-25T01:14:24Z

Implement sys::ptrace::getsyscallinfo via ptrace(PTRACE_GET_SYSCALL_INFO, ...), which is available since Linux 5.3.

emilengler · 2023-03-27T10:58:28Z

I really hope this gets into upstream very soon. I will try to do a review on this tomorrow.

emilengler · 2023-03-28T09:33:36Z

src/sys/ptrace/linux.rs

@@ -22,6 +22,9 @@ pub type AddressType = *mut ::libc::c_void;
 ))]
 use libc::user_regs_struct;

+#[cfg(all(target_os = "linux", target_env = "gnu"))]


I'm curios. Does this really need the target_env = "gnu"? I've just looked into the musl source code and found a definition for struct __ptrace_syscall_info inside include/sys/ptrace.h. Maybe it is even better, to remove the target_enventirely and replace it with a check for kernel 5.3.

In Rust libc crate, __ptrace_syscall_info is only available for gnu env. I will work on upstreaming __ptrace_syscall_info into Rust libc musl first.

emilengler · 2023-03-28T09:35:14Z

src/sys/ptrace/linux.rs

@@ -121,6 +124,8 @@ libc_enum! {
        #[cfg(all(target_os = "linux", target_env = "gnu",
                  any(target_arch = "x86", target_arch = "x86_64")))]
        PTRACE_SYSEMU_SINGLESTEP,
+        #[cfg(all(target_os = "linux", target_env = "gnu"))]


Again, my criticism with the gnu.

emilengler · 2023-03-28T09:35:19Z

src/sys/ptrace/linux.rs

@@ -152,6 +157,80 @@ libc_enum! {
    }
 }

+#[cfg(all(target_os = "linux", target_env = "gnu"))]


src/sys/ptrace/linux.rs

emilengler · 2023-03-28T09:39:50Z

src/sys/ptrace/linux.rs

+    },
+}
+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]


emilengler · 2023-03-28T09:42:18Z

src/sys/ptrace/linux.rs

@@ -292,6 +371,22 @@ pub fn getsiginfo(pid: Pid) -> Result<siginfo_t> {
    ptrace_get_data::<siginfo_t>(Request::PTRACE_GETSIGINFO, pid)
 }

+/// Get ptrace syscall info as with `ptrace(PTRACE_GET_SYSCALL_INFO,...)`
+/// Only available on Linux 5.3+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]


emilengler · 2023-03-28T09:42:55Z

test/sys/test_ptrace.rs

@@ -273,3 +273,87 @@ fn test_ptrace_syscall() {
        }
    }
 }
+
+#[cfg(all(target_os = "linux", target_env = "gnu"))]


test/sys/test_ptrace.rs

mbyzhang · 2023-04-18T22:35:02Z

Working on upstreaming __ptrace_syscall_info and other syscallinfo-related definitions into Rust libc musl first.

tamird · 2023-10-12T20:46:21Z

@mbyzhang any progress on this?

mbyzhang · 2023-12-04T22:46:47Z

Just submitted a pull request to reorgnize ptrace definitions in Rust libc crate. Waiting for the merge.

SteveLauC

Thanks for your interest in contributing to Nix! And I am sorry about the late response, I have left some comments:)

SteveLauC · 2023-12-05T01:36:39Z

CHANGELOG.md

@@ -16,6 +16,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Added `mq_timedreceive` to `::nix::mqueue`.
  ([#1966])(https://github.com/nix-rust/nix/pull/1966)
 - Added `LocalPeerPid` to `nix::sys::socket::sockopt` for macOS. ([#1967](https://github.com/nix-rust/nix/pull/1967))
+- Added `getsyscallinfo` to `nix::sys::ptrace` for Linux.
+  ([#2006](https://github.com/nix-rust/nix/pull/2006))


We have changed our changelog mode, please see CONTRIBUTING.md on how to add a changelog.

SteveLauC · 2023-12-05T01:38:56Z

src/sys/ptrace/linux.rs

@@ -152,6 +157,80 @@ libc_enum! {
    }
 }

+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(docsrs, doc(cfg(all())))]


Please remove this attribute and the one in line 175 as they are useless now

SteveLauC · 2023-12-05T01:41:34Z

src/sys/ptrace/linux.rs

+#[cfg(all(target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(docsrs, doc(cfg(all())))]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub struct SyscallInfo {


Is it possible (and convenient) to reuse the ptrace_syscall_info type from libc, like this:

#[repr(transparent)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] pub struct SyscallInfo(ptrace_syscall_info);

If so, then we should switch to it

libc ptrace_syscall_info has a union, which is not safe to use. So the safe SyscallInfo here is probably preferred.

SteveLauC · 2023-12-05T01:43:21Z

src/sys/ptrace/linux.rs

+            Request::PTRACE_GET_SYSCALL_INFO,
+            pid,
+            mem::size_of::<ptrace_syscall_info>() as *mut c_void,
+            data.as_mut_ptr() as *mut _ as *mut c_void,


For pointer type casting, we prefer .cast() over the as keyword

mbyzhang force-pushed the master branch from 63ea07a to 2c4e670 Compare February 25, 2023 01:15

mbyzhang marked this pull request as ready for review February 25, 2023 01:15

mbyzhang force-pushed the master branch from 2c4e670 to eba6282 Compare February 25, 2023 01:42

mbyzhang force-pushed the master branch 4 times, most recently from 0d8848b to 3d0d383 Compare March 23, 2023 17:18

mbyzhang marked this pull request as draft March 23, 2023 17:39

mbyzhang force-pushed the master branch from 3d0d383 to 9d7d122 Compare March 23, 2023 17:42

mbyzhang marked this pull request as ready for review March 23, 2023 17:42

mbyzhang force-pushed the master branch 2 times, most recently from c65d7eb to 9d7d122 Compare March 24, 2023 11:40

emilengler mentioned this pull request Mar 27, 2023

Support for PTRACE_GET_SYSCALL_INFO #1755

Open

emilengler approved these changes Mar 28, 2023

View reviewed changes

mbyzhang force-pushed the master branch from 9d7d122 to 4088526 Compare April 18, 2023 22:29

mbyzhang closed this Apr 18, 2023

mbyzhang force-pushed the master branch from 4088526 to 388a14c Compare April 18, 2023 22:31

ptrace: implement getsyscallinfo

ac97b9f

mbyzhang reopened this Apr 18, 2023

mbyzhang marked this pull request as draft April 18, 2023 22:34

SteveLauC requested changes Dec 5, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ptrace: implement getsyscallinfo #2006

ptrace: implement getsyscallinfo #2006

mbyzhang commented Feb 25, 2023

emilengler commented Mar 27, 2023

emilengler Mar 28, 2023

mbyzhang Apr 18, 2023

emilengler Mar 28, 2023

emilengler Mar 28, 2023

emilengler Mar 28, 2023

emilengler Mar 28, 2023

emilengler Mar 28, 2023

mbyzhang commented Apr 18, 2023

tamird commented Oct 12, 2023

mbyzhang commented Dec 4, 2023

SteveLauC left a comment

SteveLauC Dec 5, 2023

SteveLauC Dec 5, 2023

SteveLauC Dec 5, 2023

mbyzhang Dec 5, 2023

SteveLauC Dec 5, 2023

ptrace: implement getsyscallinfo #2006

Are you sure you want to change the base?

ptrace: implement getsyscallinfo #2006

Conversation

mbyzhang commented Feb 25, 2023

emilengler commented Mar 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbyzhang commented Apr 18, 2023

tamird commented Oct 12, 2023

mbyzhang commented Dec 4, 2023

SteveLauC left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment