Fix panic in multiListener

If Close() is called concurrently, both goroutines could pass the select’s default case before either of them executes close(), resulting in the channel being closed twice

Author: denpeshkov

net/multi_listen.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"net"
 	"sync"
+	"sync/atomic"
 )
 
 // connErrPair pairs conn and error which is returned by accept on sub-listeners.
@@ -38,6 +39,7 @@ type multiListener struct {
 	connCh chan connErrPair
 	// stopCh communicates from parent to child listeners.
 	stopCh chan struct{}
+	closed atomic.Bool
 }
 
 // compile time check to ensure *multiListener implements net.Listener
@@ -59,9 +61,8 @@ func MultiListen(ctx context.Context, network string, addrs ...string) (net.List
 		ctx,
 		network,
 		addrs,
-		func(ctx context.Context, network, address string) (net.Listener, error) {
-			return lc.Listen(ctx, network, address)
-		})
+		lc.Listen,
+	)
 }
 
 // multiListen implements MultiListen by consuming stdlib functions as dependency allowing
@@ -150,10 +151,8 @@ func (ml *multiListener) Accept() (net.Conn, error) {
 // the go-routines to exit.
 func (ml *multiListener) Close() error {
 	// Make sure this can be called repeatedly without explosions.
-	select {
-	case <-ml.stopCh:
+	if !ml.closed.CompareAndSwap(false, true) {
 		return fmt.Errorf("use of closed network connection")
-	default:
 	}
 
 	// Tell all sub-listeners to stop.
@@ -169,12 +168,6 @@ func (ml *multiListener) Close() error {
 	ml.wg.Wait()
 	close(ml.connCh)
 
-	// Drain any already-queued connections.
-	for connErr := range ml.connCh {
-		if connErr.conn != nil {
-			_ = connErr.conn.Close()
-		}
-	}
 	return nil
 }
 
@@ -187,7 +180,7 @@ func (ml *multiListener) Addr() net.Addr {
 
 // Addrs is like Addr, but returns the address for all registered listeners.
 func (ml *multiListener) Addrs() []net.Addr {
-	var ret []net.Addr
+	ret := make([]net.Addr, 0, len(ml.listeners))
 	for _, l := range ml.listeners {
 		ret = append(ret, l.Addr())
 	}

net/multi_listen_test.go

@@ -116,9 +116,6 @@ func listenFuncFactory(listeners []*fakeListener) func(_ context.Context, networ
 				IP:   ParseIPSloppy(host),
 				Port: port,
 			}
-			if err != nil {
-				return nil, err
-			}
 			listener.addr = addr
 			index++