Skip to content

Commit a462e9f

Browse files
eliasnaurBryan C. Mills
eliasnaur
authored and
Bryan C. Mills
committed
[release-branch.go1.13] syscall: disable sysctl on iOS
Sysctl is blocked by the App Store submission checks. This is a squash of the following cherry-picked CLs: https://golang.org/cl/193843 https://golang.org/cl/193844 https://golang.org/cl/193845 https://golang.org/cl/193846 Fixes #34170 Change-Id: I9e83cf87e942d6249e9bb67a95dba230e44badd9 Reviewed-on: https://go-review.googlesource.com/c/go/+/193843 Run-TryBot: Elias Naur <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Tobias Klauser <[email protected]> Reviewed-on: https://go-review.googlesource.com/c/go/+/193847 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent a055bb9 commit a462e9f

16 files changed

+77
-93
lines changed

‎src/log/syslog/syslog_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ func startServer(n, la string, done chan<- string) (addr string, sock io.Closer,
134134
}
135135

136136
func TestWithSimulated(t *testing.T) {
137+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
138+
t.Skipf("sysctl is not supported on iOS")
139+
}
137140
t.Parallel()
138141
msg := "Test 123"
139142
var transport []string
@@ -272,6 +275,9 @@ func check(t *testing.T, in, out string) {
272275
}
273276

274277
func TestWrite(t *testing.T) {
278+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
279+
t.Skipf("sysctl is not supported on iOS")
280+
}
275281
t.Parallel()
276282
tests := []struct {
277283
pri Priority

‎src/net/interface_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ func ipv6LinkLocalUnicastAddr(ifi *Interface) string {
5151
}
5252

5353
func TestInterfaces(t *testing.T) {
54+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
55+
t.Skipf("sysctl is not supported on iOS")
56+
}
5457
ift, err := Interfaces()
5558
if err != nil {
5659
t.Fatal(err)
@@ -82,6 +85,9 @@ func TestInterfaces(t *testing.T) {
8285
}
8386

8487
func TestInterfaceAddrs(t *testing.T) {
88+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
89+
t.Skipf("sysctl is not supported on iOS")
90+
}
8591
ift, err := Interfaces()
8692
if err != nil {
8793
t.Fatal(err)
@@ -101,6 +107,9 @@ func TestInterfaceAddrs(t *testing.T) {
101107
}
102108

103109
func TestInterfaceUnicastAddrs(t *testing.T) {
110+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
111+
t.Skipf("sysctl is not supported on iOS")
112+
}
104113
ift, err := Interfaces()
105114
if err != nil {
106115
t.Fatal(err)
@@ -128,6 +137,9 @@ func TestInterfaceUnicastAddrs(t *testing.T) {
128137
}
129138

130139
func TestInterfaceMulticastAddrs(t *testing.T) {
140+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
141+
t.Skipf("sysctl is not supported on iOS")
142+
}
131143
ift, err := Interfaces()
132144
if err != nil {
133145
t.Fatal(err)

‎src/os/os_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,9 @@ func testWindowsHostname(t *testing.T, hostname string) {
15211521
}
15221522

15231523
func TestHostname(t *testing.T) {
1524+
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
1525+
t.Skipf("sysctl is not supported on iOS")
1526+
}
15241527
hostname, err := Hostname()
15251528
if err != nil {
15261529
t.Fatal(err)

‎src/syscall/syscall_darwin.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ func Kill(pid int, signum Signal) (err error) { return kill(pid, int(signum), 1)
337337
//sysnb ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_ioctl
338338
//sysnb execve(path *byte, argv **byte, envp **byte) (err error)
339339
//sysnb exit(res int) (err error)
340-
//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error)
341340
//sys fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (val int, err error) = SYS_fcntl
342341
//sys unlinkat(fd int, path string, flags int) (err error)
343342
//sys openat(fd int, path string, flags int, perm uint32) (fdret int, err error)

‎src/syscall/syscall_darwin_386.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func setTimeval(sec, usec int64) Timeval {
2222
//sys Statfs(path string, stat *Statfs_t) (err error) = SYS_statfs64
2323
//sys fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_fstatat64
2424
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
25+
//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error)
2526

2627
func SetKevent(k *Kevent_t, fd, mode, flags int) {
2728
k.Ident = uint32(fd)

‎src/syscall/syscall_darwin_amd64.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func setTimeval(sec, usec int64) Timeval {
2222
//sys Statfs(path string, stat *Statfs_t) (err error) = SYS_statfs64
2323
//sys fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_fstatat64
2424
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
25+
//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error)
2526

2627
func SetKevent(k *Kevent_t, fd, mode, flags int) {
2728
k.Ident = uint64(fd)

‎src/syscall/syscall_darwin_arm.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ func ptrace(request int, pid int, addr uintptr, data uintptr) error {
2929
return ENOTSUP
3030
}
3131

32+
func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
33+
return ENOTSUP
34+
}
35+
3236
func SetKevent(k *Kevent_t, fd, mode, flags int) {
3337
k.Ident = uint32(fd)
3438
k.Filter = int16(mode)

‎src/syscall/syscall_darwin_arm64.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ func ptrace(request int, pid int, addr uintptr, data uintptr) error {
2929
return ENOTSUP
3030
}
3131

32+
func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
33+
return ENOTSUP
34+
}
35+
3236
func SetKevent(k *Kevent_t, fd, mode, flags int) {
3337
k.Ident = uint64(fd)
3438
k.Filter = int16(mode)

‎src/syscall/zsyscall_darwin_386.go

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

‎src/syscall/zsyscall_darwin_386.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ TEXT ·libc_execve_trampoline(SB),NOSPLIT,$0-0
229229
JMP libc_execve(SB)
230230
TEXT ·libc_exit_trampoline(SB),NOSPLIT,$0-0
231231
JMP libc_exit(SB)
232-
TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0
233-
JMP libc_sysctl(SB)
234232
TEXT ·libc_unlinkat_trampoline(SB),NOSPLIT,$0-0
235233
JMP libc_unlinkat(SB)
236234
TEXT ·libc_openat_trampoline(SB),NOSPLIT,$0-0
@@ -251,3 +249,5 @@ TEXT ·libc_fstatat64_trampoline(SB),NOSPLIT,$0-0
251249
JMP libc_fstatat64(SB)
252250
TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0
253251
JMP libc_ptrace(SB)
252+
TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0
253+
JMP libc_sysctl(SB)

‎src/syscall/zsyscall_darwin_amd64.go

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

‎src/syscall/zsyscall_darwin_amd64.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ TEXT ·libc_execve_trampoline(SB),NOSPLIT,$0-0
229229
JMP libc_execve(SB)
230230
TEXT ·libc_exit_trampoline(SB),NOSPLIT,$0-0
231231
JMP libc_exit(SB)
232-
TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0
233-
JMP libc_sysctl(SB)
234232
TEXT ·libc_unlinkat_trampoline(SB),NOSPLIT,$0-0
235233
JMP libc_unlinkat(SB)
236234
TEXT ·libc_openat_trampoline(SB),NOSPLIT,$0-0
@@ -251,3 +249,5 @@ TEXT ·libc_fstatat64_trampoline(SB),NOSPLIT,$0-0
251249
JMP libc_fstatat64(SB)
252250
TEXT ·libc_ptrace_trampoline(SB),NOSPLIT,$0-0
253251
JMP libc_ptrace(SB)
252+
TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0
253+
JMP libc_sysctl(SB)

‎src/syscall/zsyscall_darwin_arm.go

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

‎src/syscall/zsyscall_darwin_arm.s

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ TEXT ·libc_execve_trampoline(SB),NOSPLIT,$0-0
229229
JMP libc_execve(SB)
230230
TEXT ·libc_exit_trampoline(SB),NOSPLIT,$0-0
231231
JMP libc_exit(SB)
232-
TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0
233-
JMP libc_sysctl(SB)
234232
TEXT ·libc_unlinkat_trampoline(SB),NOSPLIT,$0-0
235233
JMP libc_unlinkat(SB)
236234
TEXT ·libc_openat_trampoline(SB),NOSPLIT,$0-0

‎src/syscall/zsyscall_darwin_arm64.go

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

‎src/syscall/zsyscall_darwin_arm64.s

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ TEXT ·libc_execve_trampoline(SB),NOSPLIT,$0-0
229229
JMP libc_execve(SB)
230230
TEXT ·libc_exit_trampoline(SB),NOSPLIT,$0-0
231231
JMP libc_exit(SB)
232-
TEXT ·libc_sysctl_trampoline(SB),NOSPLIT,$0-0
233-
JMP libc_sysctl(SB)
234232
TEXT ·libc_unlinkat_trampoline(SB),NOSPLIT,$0-0
235233
JMP libc_unlinkat(SB)
236234
TEXT ·libc_openat_trampoline(SB),NOSPLIT,$0-0

0 commit comments

Comments
 (0)