Skip to content

Commit a3b23cc

Browse files
tklausergopherbot
authored andcommitted
unix: use SYS_PTRACE in generated ptracePtr
CL 469835 broke the syscall wrapper generation on linux and freebsd by generating a wrapper for the inexistent SYS_PTRACE_PTR syscall. The ptracePtr added by CL 469835 correctly uses SYS_PTRACE, likely because it was manually edited in that CL. However, the incorrect SYS_PTRACE_PTR syscall is used when regenerating the syscall wrappers. Change-Id: I270d66511f926d30a9d347930e977a026e033998 Reviewed-on: https://go-review.googlesource.com/c/sys/+/470175 Reviewed-by: Than McIntosh <[email protected]> Reviewed-by: Bryan Mills <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 71a906e commit a3b23cc

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

unix/syscall_freebsd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
254254
}
255255

256256
//sys ptrace(request int, pid int, addr uintptr, data int) (err error)
257-
//sys ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error)
257+
//sys ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) = SYS_PTRACE
258258

259259
func PtraceAttach(pid int) (err error) {
260260
return ptrace(PT_ATTACH, pid, 0, 0)

unix/syscall_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ func BindToDevice(fd int, device string) (err error) {
15791579
}
15801580

15811581
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
1582-
//sys ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error)
1582+
//sys ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) = SYS_PTRACE
15831583

15841584
func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
15851585
// The peek requests are machine-size oriented, so we wrap it

unix/zsyscall_linux.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)