Skip to content

Commit 8f7df22

Browse files
tklausergopherbot
authored andcommitted
internal/asan: match runtime.asan{read,write} len parameter type
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 <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Reviewed-by: Cherry Mui <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent a73af5d commit 8f7df22

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

src/internal/asan/asan.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
const Enabled = true
1414

1515
//go:linkname Read runtime.asanread
16-
func Read(addr unsafe.Pointer, len int)
16+
func Read(addr unsafe.Pointer, len uintptr)
1717

1818
//go:linkname Write runtime.asanwrite
19-
func Write(addr unsafe.Pointer, len int)
19+
func Write(addr unsafe.Pointer, len uintptr)

src/internal/asan/noasan.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212

1313
const Enabled = false
1414

15-
func Read(addr unsafe.Pointer, len int) {
16-
}
15+
func Read(addr unsafe.Pointer, len uintptr) {}
1716

18-
func Write(addr unsafe.Pointer, len int) {
19-
}
17+
func Write(addr unsafe.Pointer, len uintptr) {}

src/syscall/syscall_unix.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func Read(fd int, p []byte) (n int, err error) {
193193
msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
194194
}
195195
if asan.Enabled && n > 0 {
196-
asan.Write(unsafe.Pointer(&p[0]), n)
196+
asan.Write(unsafe.Pointer(&p[0]), uintptr(n))
197197
}
198198
return
199199
}
@@ -217,7 +217,7 @@ func Write(fd int, p []byte) (n int, err error) {
217217
msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
218218
}
219219
if asan.Enabled && n > 0 {
220-
asan.Read(unsafe.Pointer(&p[0]), n)
220+
asan.Read(unsafe.Pointer(&p[0]), uintptr(n))
221221
}
222222
return
223223
}
@@ -236,7 +236,7 @@ func Pread(fd int, p []byte, offset int64) (n int, err error) {
236236
msan.Write(unsafe.Pointer(&p[0]), uintptr(n))
237237
}
238238
if asan.Enabled && n > 0 {
239-
asan.Write(unsafe.Pointer(&p[0]), n)
239+
asan.Write(unsafe.Pointer(&p[0]), uintptr(n))
240240
}
241241
return
242242
}
@@ -253,7 +253,7 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
253253
msan.Read(unsafe.Pointer(&p[0]), uintptr(n))
254254
}
255255
if asan.Enabled && n > 0 {
256-
asan.Read(unsafe.Pointer(&p[0]), n)
256+
asan.Read(unsafe.Pointer(&p[0]), uintptr(n))
257257
}
258258
return
259259
}

src/syscall/syscall_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
452452
msan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
453453
}
454454
if asan.Enabled && *done > 0 {
455-
asan.Write(unsafe.Pointer(&p[0]), int(*done))
455+
asan.Write(unsafe.Pointer(&p[0]), uintptr(*done))
456456
}
457457
return err
458458
}
@@ -469,7 +469,7 @@ func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error
469469
msan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
470470
}
471471
if asan.Enabled && *done > 0 {
472-
asan.Read(unsafe.Pointer(&p[0]), int(*done))
472+
asan.Read(unsafe.Pointer(&p[0]), uintptr(*done))
473473
}
474474
return err
475475
}

0 commit comments

Comments
 (0)