diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-01 20:21:37 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-01 20:21:37 +0000 |
| commit | e82d147017378b3114f1394df47242e27daeb5fd (patch) | |
| tree | b1591daa96e70aceb285f014125ad5eceede13e9 /pkg/sentry/socket/netstack | |
| parent | e04f4bfef606ec8297223456eaa80fc1ee9d780e (diff) | |
| parent | ebd3912c0f7e4255f100a00d2ab27304dac70daa (diff) | |
Merge release-20210125.0-47-gebd3912c0 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack')
| -rw-r--r-- | pkg/sentry/socket/netstack/netstack.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index 94f03af48..69693f263 100644 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -2666,9 +2666,9 @@ func (s *socketOpsCommon) dequeueErr() *tcpip.SockError { } // Update socket error to reflect ICMP errors in queue. - if nextErr := so.PeekErr(); nextErr != nil && nextErr.ErrOrigin.IsICMPErr() { + if nextErr := so.PeekErr(); nextErr != nil && nextErr.Cause.Origin().IsICMPErr() { so.SetLastError(nextErr.Err) - } else if err.ErrOrigin.IsICMPErr() { + } else if err.Cause.Origin().IsICMPErr() { so.SetLastError(nil) } return err |