Skip to content

Commit f373fb2

Browse files
eliasnaurcryptix
authored andcommitted
unix: disable ptrace on iOS
The ptrace system call is blocked by the App Store. Updates golang/go#31628 Change-Id: I88977cb2f0892661a7221bc822dd513a951cbf67
1 parent fae7ac5 commit f373fb2

14 files changed

+56
-79
lines changed

unix/syscall_darwin.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ func direntNamlen(buf []byte) (uint64, bool) {
8989
return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
9090
}
9191

92-
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
9392
func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
9493
func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
9594

unix/syscall_darwin_386.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"syscall"
1111
)
1212

13+
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
14+
1315
func setTimespec(sec, nsec int64) Timespec {
1416
return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
1517
}

unix/syscall_darwin_amd64.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"syscall"
1111
)
1212

13+
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
14+
1315
func setTimespec(sec, nsec int64) Timespec {
1416
return Timespec{Sec: sec, Nsec: nsec}
1517
}

unix/syscall_darwin_arm.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ import (
88
"syscall"
99
)
1010

11+
func ptrace(request int, pid int, addr uintptr, data uintptr) error {
12+
return ENOTSUP
13+
}
14+
1115
func setTimespec(sec, nsec int64) Timespec {
1216
return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
1317
}

unix/syscall_darwin_arm64.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ import (
1010
"syscall"
1111
)
1212

13+
func ptrace(request int, pid int, addr uintptr, data uintptr) error {
14+
return ENOTSUP
15+
}
16+
1317
func setTimespec(sec, nsec int64) Timespec {
1418
return Timespec{Sec: sec, Nsec: nsec}
1519
}

unix/zsyscall_darwin_386.1_11.go

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

unix/zsyscall_darwin_386.go

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

unix/zsyscall_darwin_386.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0
6464
JMP libc_munlock(SB)
6565
TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0
6666
JMP libc_munlockall(SB)
67-
TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0
68-
JMP libc_ptrace(SB)
6967
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
7068
JMP libc_getattrlist(SB)
7169
TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0
@@ -264,6 +262,8 @@ TEXT ·libc_mmap_trampoline(SB),NOSPLIT,$0-0
264262
JMP libc_mmap(SB)
265263
TEXT ·libc_munmap_trampoline(SB),NOSPLIT,$0-0
266264
JMP libc_munmap(SB)
265+
TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0
266+
JMP libc_ptrace(SB)
267267
TEXT ·libc_gettimeofday_trampoline(SB),NOSPLIT,$0-0
268268
JMP libc_gettimeofday(SB)
269269
TEXT ·libc_fstat64_trampoline(SB),NOSPLIT,$0-0

unix/zsyscall_darwin_amd64.go

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

unix/zsyscall_darwin_amd64.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0
6464
JMP libc_munlock(SB)
6565
TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0
6666
JMP libc_munlockall(SB)
67-
TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0
68-
JMP libc_ptrace(SB)
6967
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
7068
JMP libc_getattrlist(SB)
7169
TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0
@@ -266,6 +264,8 @@ TEXT ·libc_mmap_trampoline(SB),NOSPLIT,$0-0
266264
JMP libc_mmap(SB)
267265
TEXT ·libc_munmap_trampoline(SB),NOSPLIT,$0-0
268266
JMP libc_munmap(SB)
267+
TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0
268+
JMP libc_ptrace(SB)
269269
TEXT ·libc_gettimeofday_trampoline(SB),NOSPLIT,$0-0
270270
JMP libc_gettimeofday(SB)
271271
TEXT ·libc_fstat64_trampoline(SB),NOSPLIT,$0-0

0 commit comments

Comments
 (0)