Fix "Fix gLazyConn race"

nekohasekai · nekohasekai · commit 421b236278b0 · 2025-06-15T17:30:35.000+08:00
diff --git a/stack_gvisor_lazy.go b/stack_gvisor_lazy.go
@@ -145,6 +145,8 @@ func (c *gLazyConn) Close() error {
 			c.handshakeErr = net.ErrClosed
 			c.handshakeDone = true
 			return nil
+		} else if c.handshakeErr != nil {
+			return nil
 		}
 		c.handshakeAccess.Unlock()
 	}
@@ -159,6 +161,8 @@ func (c *gLazyConn) CloseRead() error {
 			c.handshakeErr = net.ErrClosed
 			c.handshakeDone = true
 			return nil
+		} else if c.handshakeErr != nil {
+			return nil
 		}
 		c.handshakeAccess.Unlock()
 	}
@@ -173,6 +177,8 @@ func (c *gLazyConn) CloseWrite() error {
 			c.handshakeErr = net.ErrClosed
 			c.handshakeDone = true
 			return nil
+		} else if c.handshakeErr != nil {
+			return nil
 		}
 		c.handshakeAccess.Unlock()
 	}

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ func (c *gLazyConn) Close() error {`
`145`	`145`	`c.handshakeErr = net.ErrClosed`
`146`	`146`	`c.handshakeDone = true`
`147`	`147`	`return nil`
	`148`	`+ } else if c.handshakeErr != nil {`
	`149`	`+ return nil`
`148`	`150`	`}`
`149`	`151`	`c.handshakeAccess.Unlock()`
`150`	`152`	`}`
`@@ -159,6 +161,8 @@ func (c *gLazyConn) CloseRead() error {`
`159`	`161`	`c.handshakeErr = net.ErrClosed`
`160`	`162`	`c.handshakeDone = true`
`161`	`163`	`return nil`
	`164`	`+ } else if c.handshakeErr != nil {`
	`165`	`+ return nil`
`162`	`166`	`}`
`163`	`167`	`c.handshakeAccess.Unlock()`
`164`	`168`	`}`
`@@ -173,6 +177,8 @@ func (c *gLazyConn) CloseWrite() error {`
`173`	`177`	`c.handshakeErr = net.ErrClosed`
`174`	`178`	`c.handshakeDone = true`
`175`	`179`	`return nil`
	`180`	`+ } else if c.handshakeErr != nil {`
	`181`	`+ return nil`
`176`	`182`	`}`
`177`	`183`	`c.handshakeAccess.Unlock()`
`178`	`184`	`}`