cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-28 19:02:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: avoid racing on port reuse in TestListenConfigControl

Browse Source 
Fixes #52798.
Fixes #51441 (until proven otherwise 😅).

Change-Id: Ic1eadebd0d41c5cbe37340190f8b2bde4b6c5673
Reviewed-on: https://go-review.googlesource.com/c/go/+/405214
Run-TryBot: Bryan Mills <bcmills@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Bryan C. Mills 2022-05-09 12:51:28 -04:00 committed by Gopher Robot
parent 0d410d676d
commit 4861475c1a
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/net/listen_test.go
View File

@ -7,7 +7,6 @@
package net package net
import ( import (
"context"
"fmt" "fmt"
"internal/testenv" "internal/testenv"
"os" "os"
@ -735,17 +734,7 @@ func TestListenConfigControl(t *testing.T) {
if !testableNetwork(network) { if !testableNetwork(network) {
continue continue
} }
ln := newLocalListener(t, network) ln := newLocalListener(t, network, &ListenConfig{Control: controlOnConnSetup})
address := ln.Addr().String()
// TODO: This is racy. The selected address could be reused in between
// this Close and the subsequent Listen.
ln.Close()
lc := ListenConfig{Control: controlOnConnSetup}
ln, err := lc.Listen(context.Background(), network, address)
if err != nil {
t.Error(err)
continue
}
ln.Close() ln.Close()
} }
}) })
@ -754,24 +743,8 @@ func TestListenConfigControl(t *testing.T) {
if !testableNetwork(network) { if !testableNetwork(network) {
continue continue
} }
c := newLocalPacketListener(t, network) c := newLocalPacketListener(t, network, &ListenConfig{Control: controlOnConnSetup})
address := c.LocalAddr().String()
// TODO: This is racy. The selected address could be reused in between
// this Close and the subsequent ListenPacket.
c.Close() c.Close()
if network == "unixgram" {
os.Remove(address)
}
lc := ListenConfig{Control: controlOnConnSetup}
c, err := lc.ListenPacket(context.Background(), network, address)
if err != nil {
t.Error(err)
continue
}
c.Close()
if network == "unixgram" {
os.Remove(address)
}
} }
}) })
} }

31
src/net/mockserver_test.go
View File

@ -7,6 +7,7 @@
package net package net
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
"os" "os"
@ -33,9 +34,20 @@ func testUnixAddr(t testing.TB) string {
return filepath.Join(d, "sock") return filepath.Join(d, "sock")
} }
func newLocalListener(t testing.TB, network string) Listener { func newLocalListener(t testing.TB, network string, lcOpt ...*ListenConfig) Listener {
var lc *ListenConfig
switch len(lcOpt) {
case 0:
lc = new(ListenConfig)
case 1:
lc = lcOpt[0]
default:
t.Helper()
t.Fatal("too many ListenConfigs passed to newLocalListener: want 0 or 1")
}
listen := func(net, addr string) Listener { listen := func(net, addr string) Listener {
ln, err := Listen(net, addr) ln, err := lc.Listen(context.Background(), net, addr)
if err != nil { if err != nil {
t.Helper() t.Helper()
t.Fatal(err) t.Fatal(err)
@ -306,9 +318,20 @@ func transceiver(c Conn, wb []byte, ch chan<- error) {
} }
} }
func newLocalPacketListener(t testing.TB, network string) PacketConn { func newLocalPacketListener(t testing.TB, network string, lcOpt ...*ListenConfig) PacketConn {
var lc *ListenConfig
switch len(lcOpt) {
case 0:
lc = new(ListenConfig)
case 1:
lc = lcOpt[0]
default:
t.Helper()
t.Fatal("too many ListenConfigs passed to newLocalListener: want 0 or 1")
}
listenPacket := func(net, addr string) PacketConn { listenPacket := func(net, addr string) PacketConn {
c, err := ListenPacket(net, addr) c, err := lc.ListenPacket(context.Background(), net, addr)
if err != nil { if err != nil {
t.Helper() t.Helper()
t.Fatal(err) t.Fatal(err)