mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 12:01:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

syscall: port fix for netbsd unix sockets from upstream

Browse Source 
NetBSD does not include the null terminator when in its reported socket
length. Port the upstream bugfix for the issue (#6627).

This was likely missed during the usual upstream merge because the gc
and gccgo socket implementations have diverged quite a bit.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/261741
This commit is contained in:
Nikhil Benesch 2020-10-13 07:06:11 +00:00 committed by Ian Lance Taylor
parent 78fbe731a8
commit 7355c1df55
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -1,4 +1,4 @@
fef8afc1876f4a1d5e9a8fd54c21bf5917966e10
5e76d81ec120e05a59e6c7d173ddf8a3de466bd0
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

12
libgo/go/syscall/socket_bsd.go
View File

@ -52,13 +52,19 @@ func (sa *RawSockaddrUnix) setLen(n int) {
}
func (sa *RawSockaddrUnix) getLen() (int, error) {
if sa.Len < 3 || sa.Len > SizeofSockaddrUnix {
if sa.Len < 2 || sa.Len > SizeofSockaddrUnix {
return 0, EINVAL
}
n := int(sa.Len) - 3 // subtract leading Family, Len, terminating NUL.
// Some BSDs include the trailing NUL in the length, whereas
// others do not. Work around this by subtracting the leading
// family and len. The path is then scanned to see if a NUL
// terminator still exists within the length.
n := int(sa.Len) - 2 // subtract leading Family, Len
for i := 0; i < n; i++ {
if sa.Path[i] == 0 {
// found early NUL; assume Len is overestimating.
// found early NUL; assume Len included the NUL
// or was overestimating.
n = i
break
}