mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'changes'

This commit is contained in:
Albert Sundjaja 2025-02-20 20:08:59 +11:00
parent 9b842e2e63 3dbcc8bded
commit e0e09aef4e
4 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/unixsock_linux_test.go
View File

@ -49,6 +49,23 @@ func TestUnixAutobindClose(t *testing.T) {
ln.Close()
}
func TestUnixAbstractLongNameNullStart(t *testing.T) {
// Create an abstract socket name that starts with a null byte ("\x00")
// whose length is the maximum of RawSockaddrUnix Path len
paddedAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path))
copy(paddedAddr, "\x00abstract_test")
la, err := ResolveUnixAddr("unix", string(paddedAddr))
if err != nil {
t.Fatal(err)
}
c, err := ListenUnix("unix", la)
if err != nil {
t.Fatal(err)
}
defer c.Close()
}
func TestUnixgramLinuxAbstractLongName(t *testing.T) {
if !testableNetwork("unixgram") {
t.Skip("abstract unix socket long name test")

22
src/net/unixsock_windows_test.go
View File

@ -10,6 +10,7 @@ import (
"internal/syscall/windows"
"os"
"reflect"
"syscall"
"testing"
)
@ -69,6 +70,27 @@ func TestUnixConnLocalWindows(t *testing.T) {
}
}
func TestUnixAbstractLongNameNullStart(t *testing.T) {
if !windows.SupportUnixSocket() {
t.Skip("unix test")
}
// Create an abstract socket name that starts with a null byte ("\x00")
// whose length is the maximum of RawSockaddrUnix Path len
paddedAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path))
copy(paddedAddr, "\x00abstract_test")
la, err := ResolveUnixAddr("unix", string(paddedAddr))
if err != nil {
t.Fatal(err)
}
c, err := ListenUnix("unix", la)
if err != nil {
t.Fatal(err)
}
defer c.Close()
}
func TestModeSocket(t *testing.T) {
if !windows.SupportUnixSocket() {
t.Skip("unix test")

6
src/syscall/syscall_linux.go
View File

@ -550,7 +550,8 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
if n > len(sa.raw.Path) {
return nil, 0, EINVAL
}
if n == len(sa.raw.Path) && name[0] != '@' {
isAbstract := n > 0 && (name[0] == '@' || name[0] == '\x00')
if n == len(sa.raw.Path) && !isAbstract {
return nil, 0, EINVAL
}
sa.raw.Family = AF_UNIX
@ -562,8 +563,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
if n > 0 {
sl += _Socklen(n) + 1
}
if sa.raw.Path[0] == '@' || (sa.raw.Path[0] == 0 && sl > 3) {
// Check sl > 3 so we don't change unnamed socket behavior.
if isAbstract {
sa.raw.Path[0] = 0
// Don't count trailing NUL for abstract address.
sl--

6
src/syscall/syscall_windows.go
View File

@ -858,7 +858,8 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, int32, error) {
if n > len(sa.raw.Path) {
return nil, 0, EINVAL
}
if n == len(sa.raw.Path) && name[0] != '@' {
isAbstract := n > 0 && (name[0] == '@' || name[0] == '\x00')
if n == len(sa.raw.Path) && !isAbstract {
return nil, 0, EINVAL
}
sa.raw.Family = AF_UNIX
@ -870,8 +871,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, int32, error) {
if n > 0 {
sl += int32(n) + 1
}
if sa.raw.Path[0] == '@' || (sa.raw.Path[0] == 0 && sl > 3) {
// Check sl > 3 so we don't change unnamed socket behavior.
if isAbstract {
sa.raw.Path[0] = 0
// Don't count trailing NUL for abstract address.
sl--