diff options
| author | Bhasker Hariharan <bhaskerh@google.com> | 2020-09-08 12:29:26 -0700 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-09-09 17:53:10 -0700 |
| commit | 03a529d8ac52ab0227a0bbd85aaa3d8808b11e59 (patch) | |
| tree | 4f4b154a550fa26d2e625b1b9cf5eba11962d6e2 /pkg | |
| parent | 89581f6495f201344227f3571eda8f9305e77d06 (diff) | |
Fix data race in tcp.GetSockOpt.
e.ID can't be read without holding e.mu. GetSockOpt was reading e.ID
when looking up OriginalDst without holding e.mu.
PiperOrigin-RevId: 330562293
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/tcpip/transport/tcp/endpoint.go | 2 |
1 files changed, 2 insertions, 0 deletions
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 } |