Skip to content

linux: update ptrace_syscall_info struct #4966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Marcondiro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

linux: update ptrace_syscall_info struct #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4142,6 +4142,10 @@ fn test_linux(target: &str) {
// FIXME(musl): New fields in newer versions
"utmpx" if !old_musl => true,

// FIXME(linux): Requires >= 6.16 kernel headers.
// On 64 bits the size did not change, skip only for 32 bits.
"ptrace_syscall_info" if pointer_width == 32 => true,

_ => false,
}
});
Expand Down Expand Up @@ -4683,7 +4687,9 @@ fn test_linux(target: &str) {
true
}
// the `u` field is in fact an anonymous union
("ptrace_syscall_info", "u" | "pad") if gnu => true,
("ptrace_syscall_info", "u") if gnu => true,
// FIXME(linux): `flags` requires >= 6.16 kernel headers
("ptrace_syscall_info", "flags") if gnu => true,
// the vregs field is a `__uint128_t` C's type.
("user_fpsimd_struct", "vregs") => true,
// Linux >= 5.11 tweaked the `svm_zero` field of the `sockaddr_vm` struct.
Expand Down
6 changes: 4 additions & 2 deletions src/unix/linux_like/linux/gnu/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,21 @@ s! {
}

pub struct __c_anonymous_ptrace_syscall_info_exit {
pub sval: crate::__s64,
pub rval: crate::__s64,
pub is_error: crate::__u8,
}

pub struct __c_anonymous_ptrace_syscall_info_seccomp {
pub nr: crate::__u64,
pub args: [crate::__u64; 6],
pub ret_data: crate::__u32,
reserved2: Padding<crate::__u32>,
}

pub struct ptrace_syscall_info {
pub op: crate::__u8,
pub pad: [crate::__u8; 3],
reserved: Padding<crate::__u8>,
pub flags: crate::__u16,
pub arch: crate::__u32,
pub instruction_pointer: crate::__u64,
pub stack_pointer: crate::__u64,
Expand Down