From 92e25882bc1e42d55266fc42f294ad27dcf81fb8 Mon Sep 17 00:00:00 2001
From: Nicolas Lacasse <nlacasse@google.com>
Date: Wed, 14 Dec 2022 10:38:18 -0800
Subject: [PATCH] gonet: Log an error if GetRemoteAddress() fails.

We eat the error, but we should at least log it first.

PiperOrigin-RevId: 495354937
---
 pkg/tcpip/adapters/gonet/BUILD    | 1 +
 pkg/tcpip/adapters/gonet/gonet.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pkg/tcpip/adapters/gonet/BUILD b/pkg/tcpip/adapters/gonet/BUILD
index 3e1c2ddc6..317aefeec 100644
--- a/pkg/tcpip/adapters/gonet/BUILD
+++ b/pkg/tcpip/adapters/gonet/BUILD
@@ -7,6 +7,7 @@ go_library(
     srcs = ["gonet.go"],
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/log",
         "//pkg/sync",
         "//pkg/tcpip",
         "//pkg/tcpip/stack",
diff --git a/pkg/tcpip/adapters/gonet/gonet.go b/pkg/tcpip/adapters/gonet/gonet.go
index b5426811b..6c4f3d2d0 100644
--- a/pkg/tcpip/adapters/gonet/gonet.go
+++ b/pkg/tcpip/adapters/gonet/gonet.go
@@ -24,6 +24,7 @@ import (
 	"net"
 	"time"
 
+	"gvisor.dev/gvisor/pkg/log"
 	"gvisor.dev/gvisor/pkg/sync"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"
@@ -453,6 +454,7 @@ func (c *TCPConn) LocalAddr() net.Addr {
 func (c *TCPConn) RemoteAddr() net.Addr {
 	a, err := c.ep.GetRemoteAddress()
 	if err != nil {
+		log.Warningf("ep.GetRemoteAddress() failed: %v", err)
 		return nil
 	}
 	return fullToTCPAddr(a)
@@ -621,6 +623,7 @@ func (c *UDPConn) newRemoteOpError(op string, remote net.Addr, err error) *net.O
 func (c *UDPConn) RemoteAddr() net.Addr {
 	a, err := c.ep.GetRemoteAddress()
 	if err != nil {
+		log.Warningf("ep.GetRemoteAddress() failed: %v", err)
 		return nil
 	}
 	return fullToUDPAddr(a)