diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-08 19:37:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-08 19:37:12 +0000 |
| commit | 41db15c575c283d93c6dd432bc68382e4f4a7928 (patch) | |
| tree | 1ca997404c9b6a9636bf5ebed4890ff6ab6cd989 /pkg/tcpip | |
| parent | 936d44161505242f5dea33ec1db1d5d1b5d19068 (diff) | |
| parent | 38cdb0579b698d67abad4f7f6ba18a84eef66bd7 (diff) | |
Merge release-20200818.0-128-g38cdb0579 (automated)
Diffstat (limited to 'pkg/tcpip')
| -rw-r--r-- | pkg/tcpip/link/tun/tun_endpoint_refs.go | 5 | ||||
| -rw-r--r-- | pkg/tcpip/transport/tcp/endpoint.go | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/tcpip/link/tun/tun_endpoint_refs.go b/pkg/tcpip/link/tun/tun_endpoint_refs.go index e0595429c..9a38142f5 100644 --- a/pkg/tcpip/link/tun/tun_endpoint_refs.go +++ b/pkg/tcpip/link/tun/tun_endpoint_refs.go @@ -2,11 +2,10 @@ package tun import ( "fmt" - "runtime" - "sync/atomic" - "gvisor.dev/gvisor/pkg/log" refs_vfs1 "gvisor.dev/gvisor/pkg/refs" + "runtime" + "sync/atomic" ) // ownerType is used to customize logging. Note that we use a pointer to T so diff --git a/pkg/tcpip/transport/tcp/endpoint.go b/pkg/tcpip/transport/tcp/endpoint.go index 8cb769d58..6d5046a3d 100644 --- a/pkg/tcpip/transport/tcp/endpoint.go +++ b/pkg/tcpip/transport/tcp/endpoint.go @@ -2019,8 +2019,10 @@ func (e *endpoint) GetSockOpt(opt tcpip.GettableSocketOption) *tcpip.Error { e.UnlockUser() case *tcpip.OriginalDestinationOption: + e.LockUser() ipt := e.stack.IPTables() addr, port, err := ipt.OriginalDst(e.ID) + e.UnlockUser() if err != nil { return err } |