diff options
| author | Ting-Yu Wang <anivia@google.com> | 2021-05-12 14:09:52 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-05-12 14:12:38 -0700 |
| commit | ba6de21539131bbf8116137704259e4d11d2894b (patch) | |
| tree | d407e9e121c743505cf8833db4fc0c36ef69d9fe /pkg/tcpip/transport/tcp/segment.go | |
| parent | 07e32fa6967370ef29327417fd941c5130335fbc (diff) | |
Fix not calling decRef on merged segments
This code path is for outgoing packets, and we don't currently do memory
accounting on this path. So it wasn't breaking anything.
This change did not add a test for ref-counting issue fixed, but will switch to
the leak-checking ref-counter later when all ref-counting issues are fixed.
PiperOrigin-RevId: 373447913
Diffstat (limited to 'pkg/tcpip/transport/tcp/segment.go')
| -rw-r--r-- | pkg/tcpip/transport/tcp/segment.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkg/tcpip/transport/tcp/segment.go b/pkg/tcpip/transport/tcp/segment.go index c28641be3..7e5ba6ef7 100644 --- a/pkg/tcpip/transport/tcp/segment.go +++ b/pkg/tcpip/transport/tcp/segment.go @@ -140,6 +140,15 @@ func (s *segment) clone() *segment { return t } +// merge merges data in oth and clears oth. +func (s *segment) merge(oth *segment) { + s.data.Append(oth.data) + s.dataMemSize = s.data.Size() + + oth.data = buffer.VectorisedView{} + oth.dataMemSize = oth.data.Size() +} + // flagIsSet checks if at least one flag in flags is set in s.flags. func (s *segment) flagIsSet(flags header.TCPFlags) bool { return s.flags&flags != 0 |