qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-28 17:24:28 -06:00
Code Releases Activity

internal/asan: match runtime.asan{read,write} len parameter type

Browse Source 
The len parameter runtime.asan{read,write} is of type uintptr. Match its
type in Read and Write.

For #64611

Change-Id: I0be278c38a357e600521ced87c0e23038a11e8a2
Reviewed-on: https://go-review.googlesource.com/c/go/+/572755
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Tobias Klauser 2024-03-19 11:23:59 +01:00 committed by Gopher Robot
parent a73af5d91c
commit 8f7df2256e
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal/asan/asan.go
View File

@ -13,7 +13,7 @@ import (
const Enabled = true
//go:linkname Read runtime.asanread
func Read(addr unsafe.Pointer, len int)
func Read(addr unsafe.Pointer, len uintptr)
//go:linkname Write runtime.asanwrite
func Write(addr unsafe.Pointer, len int)
func Write(addr unsafe.Pointer, len uintptr)

6
src/internal/asan/noasan.go
View File

@ -12,8 +12,6 @@ import (
const Enabled = false
func Read(addr unsafe.Pointer, len int) {
}
func Read(addr unsafe.Pointer, len uintptr) {}
func Write(addr unsafe.Pointer, len int) {
}
func Write(addr unsafe.Pointer, len uintptr) {}

8
src/syscall/syscall_unix.go
View File

@ -193,7 +193,7 @@ func Read(fd int, p []byte) (n int, err error) {
msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
}
if asan.Enabled && n > 0 {
asan.Write(unsafe.Pointer(&p[0]), n)
asan.Write(unsafe.Pointer(&p[0]), uintptr(n))
}
return
}
@ -217,7 +217,7 @@ func Write(fd int, p []byte) (n int, err error) {
msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
}
if asan.Enabled && n > 0 {
asan.Read(unsafe.Pointer(&p[0]), n)
asan.Read(unsafe.Pointer(&p[0]), uintptr(n))
}
return
}
@ -236,7 +236,7 @@ func Pread(fd int, p []byte, offset int64) (n int, err error) {
msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
}
if asan.Enabled && n > 0 {
asan.Write(unsafe.Pointer(&p[0]), n)
asan.Write(unsafe.Pointer(&p[0]), uintptr(n))
}
return
}
@ -253,7 +253,7 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
}
if asan.Enabled && n > 0 {
asan.Read(unsafe.Pointer(&p[0]), n)
asan.Read(unsafe.Pointer(&p[0]), uintptr(n))
}
return
}

4
src/syscall/syscall_windows.go
View File

@ -452,7 +452,7 @@ func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
msan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
}
if asan.Enabled && *done > 0 {
asan.Write(unsafe.Pointer(&p[0]), int(*done))
asan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
}
return err
}
@ -469,7 +469,7 @@ func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error
msan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
}
if asan.Enabled && *done > 0 {
asan.Read(unsafe.Pointer(&p[0]), int(*done))
asan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
}
return err
}