Merge release-20211101.0-24-g55b70552c (automated)

3 files changed, 4 insertions, 4 deletions

diff --git a/pkg/sentry/fs/gofer/socket.go b/pkg/sentry/fs/gofer/socket.go
index 17932bf1a..16bb9110a 100644
--- a/pkg/sentry/fs/gofer/socket.go
+++ b/pkg/sentry/fs/gofer/socket.go
@@ -79,7 +79,7 @@ func sockTypeToP9(t linux.SockType) (p9.ConnectFlags, bool) {
 	return 0, false
 }
 
-// BidirectionalConnect implements ConnectableEndpoint.BidirectionalConnect.
+// BidirectionalConnect implements BoundEndpoint.BidirectionalConnect.
 func (e *endpoint) BidirectionalConnect(ctx context.Context, ce transport.ConnectingEndpoint, returnConnect func(transport.Receiver, transport.ConnectedEndpoint)) *syserr.Error {
 	cf, ok := sockTypeToP9(ce.Type())
 	if !ok {
diff --git a/pkg/sentry/fsimpl/gofer/socket.go b/pkg/sentry/fsimpl/gofer/socket.go
index e29614da6..88d832e1f 100644
--- a/pkg/sentry/fsimpl/gofer/socket.go
+++ b/pkg/sentry/fsimpl/gofer/socket.go
@@ -58,7 +58,7 @@ func sockTypeToP9(t linux.SockType) (p9.ConnectFlags, bool) {
 	return 0, false
 }
 
-// BidirectionalConnect implements ConnectableEndpoint.BidirectionalConnect.
+// BidirectionalConnect implements BoundEndpoint.BidirectionalConnect.
 func (e *endpoint) BidirectionalConnect(ctx context.Context, ce transport.ConnectingEndpoint, returnConnect func(transport.Receiver, transport.ConnectedEndpoint)) *syserr.Error {
 	// No lock ordering required as only the ConnectingEndpoint has a mutex.
 	ce.Lock()
diff --git a/pkg/sentry/socket/unix/transport/connectioned.go b/pkg/sentry/socket/unix/transport/connectioned.go
index 46fbaac1b..690d4de24 100644
--- a/pkg/sentry/socket/unix/transport/connectioned.go
+++ b/pkg/sentry/socket/unix/transport/connectioned.go
@@ -44,7 +44,7 @@ type ConnectingEndpoint interface {
 
 	// Type returns the socket type, typically either SockStream or
 	// SockSeqpacket. The connection attempt must be aborted if this
-	// value doesn't match the ConnectableEndpoint's type.
+	// value doesn't match the BoundEndpoint's type.
 	Type() linux.SockType
 
 	// GetLocalAddress returns the bound path.
@@ -69,7 +69,7 @@ type ConnectingEndpoint interface {
 }
 
 // connectionedEndpoint is a Unix-domain connected or connectable endpoint and implements
-// ConnectingEndpoint, ConnectableEndpoint and tcpip.Endpoint.
+// ConnectingEndpoint, BoundEndpoint and tcpip.Endpoint.
 //
 // connectionedEndpoints must be in connected state in order to transfer data.
 //