qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-14 17:20:21 -07:00
Code Releases Activity

runtime: use arc4random_buf() for readRandom

Browse Source 
readRandom doesn't matter on Linux because of startupRand, but it does
on Windows and macOS. Windows already uses the same API as crypto/rand.
Switch macOS away from the /dev/urandom read.

Updates #68278

Cq-Include-Trybots: luci.golang.try:gotip-darwin-amd64_14
Change-Id: Ie8f105e35658a6f10ff68798d14883e3b212eb3e
Reviewed-on: https://go-review.googlesource.com/c/go/+/608436
Reviewed-by: Roland Shoemaker <roland@golang.org>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Filippo Valsorda 2024-08-26 19:57:43 +02:00
parent 63cd5a39e9
commit 311372c53c
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/os_darwin.go
View File

@ -192,14 +192,10 @@ func getPageSize() uintptr {
return 0
}
var urandom_dev = []byte("/dev/urandom\x00")
//go:nosplit
func readRandom(r []byte) int {
fd := open(&urandom_dev[0], 0 /* O_RDONLY */, 0)
n := read(fd, unsafe.Pointer(&r[0]), int32(len(r)))
closefd(fd)
return int(n)
arc4random_buf(unsafe.Pointer(&r[0]), int32(len(r)))
return len(r)
}
func goenvs() {

10
src/runtime/sys_darwin.go
View File

@ -571,6 +571,15 @@ func pthread_cond_signal(c *pthreadcond) int32 {
}
func pthread_cond_signal_trampoline()
//go:nosplit
//go:cgo_unsafe_args
func arc4random_buf(p unsafe.Pointer, n int32) {
// arc4random_buf() never fails, per its man page, so it's safe to ignore the return value.
libcCall(unsafe.Pointer(abi.FuncPCABI0(arc4random_buf_trampoline)), unsafe.Pointer(&p))
KeepAlive(p)
}
func arc4random_buf_trampoline()
// Not used on Darwin, but must be defined.
func exitThread(wait *atomic.Uint32) {
throw("exitThread")
@ -691,6 +700,7 @@ func proc_regionfilename_trampoline()
//go:cgo_import_dynamic libc_pthread_cond_wait pthread_cond_wait "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_pthread_cond_timedwait_relative_np pthread_cond_timedwait_relative_np "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_pthread_cond_signal pthread_cond_signal "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_arc4random_buf arc4random_buf "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_notify_is_valid_token notify_is_valid_token "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_xpc_date_create_from_current xpc_date_create_from_current "/usr/lib/libSystem.B.dylib"

6
src/runtime/sys_darwin_amd64.s
View File

@ -500,6 +500,12 @@ TEXT runtime·osinit_hack_trampoline(SB),NOSPLIT,$0
CALL libc_xpc_date_create_from_current(SB)
RET
TEXT runtime·arc4random_buf_trampoline(SB),NOSPLIT,$0
MOVL 8(DI), SI // arg 2 nbytes
MOVQ 0(DI), DI // arg 1 buf
CALL libc_arc4random_buf(SB)
RET
// syscall calls a function in libc on behalf of the syscall package.
// syscall takes a pointer to a struct like:
// struct {

6
src/runtime/sys_darwin_arm64.s
View File

@ -475,6 +475,12 @@ TEXT runtime·osinit_hack_trampoline(SB),NOSPLIT,$0
BL libc_xpc_date_create_from_current(SB)
RET
TEXT runtime·arc4random_buf_trampoline(SB),NOSPLIT,$0
MOVW 8(R0), R1 // arg 2 nbytes
MOVD 0(R0), R0 // arg 1 buf
BL libc_arc4random_buf(SB)
RET
// syscall calls a function in libc on behalf of the syscall package.
// syscall takes a pointer to a struct like:
// struct {