qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-15 00:50:32 -07:00
Code Releases Activity

syscall: reroute SYS_IOCTL and SYS_SYSCTL on openbsd

Browse Source 
OpenBSD 7.5 no longer supports indirect syscalls. A number of Go
packages make use of syscall.Syscall with SYS_IOCTL or SYS_SYSCTL,
since neither is well supported by golang.org/x/sys/unix. Reroute
calls with either of these system call numbers to the respective
libc stub so that they continue to work.

Updates #63900

Change-Id: I3323a3fa311ee9227e6220417834253763866881
Reviewed-on: https://go-review.googlesource.com/c/go/+/582256
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: David Chase <drchase@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Joel Sing 2023-11-12 22:56:49 +11:00
parent 17fce63239
commit 8841f50d98
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/syscall/syscall_openbsd_libc.go
View File

@ -19,10 +19,26 @@ func init() {
//sys directSyscall(trap uintptr, a1 uintptr, a2 uintptr, a3 uintptr, a4 uintptr, a5 uintptr) (ret uintptr, err error) = SYS_syscall
func syscallInternal(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) {
// OpenBSD 7.5+ no longer supports indirect syscalls. A number of Go
// packages make use of syscall.Syscall with SYS_IOCTL since it is
// not well supported by golang.org/x/sys/unix. Reroute this system
// call number to the respective libc stub so that it continues to
// work for the time being. See #63900 for further details.
if trap == SYS_IOCTL {
return syscallX(abi.FuncPCABI0(libc_ioctl_trampoline), a1, a2, a3)
}
return syscall6X(abi.FuncPCABI0(libc_syscall_trampoline), trap, a1, a2, a3, 0, 0)
}
func syscall6Internal(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) {
// OpenBSD 7.5+ no longer supports indirect syscalls. A number of Go
// packages make use of syscall.Syscall with SYS___SYSCTL since it is
// not well supported by golang.org/x/sys/unix. Reroute this system
// call number to the respective libc stub so that it continues to
// work for the time being. See #63900 for further details.
if trap == SYS___SYSCTL {
return syscall6X(abi.FuncPCABI0(libc_sysctl_trampoline), a1, a2, a3, a4, a5, a6)
}
return syscall10X(abi.FuncPCABI0(libc_syscall_trampoline), trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
}