From 371abe00f052dec37106f2dc22921bc84fb94818 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 3 Mar 2020 15:06:07 -0800 Subject: Avoid memory leaks Properly discard segments from the segment heap. PiperOrigin-RevId: 298704074 --- pkg/tcpip/transport/tcp/rcv.go | 4 ++++ pkg/tcpip/transport/tcp/segment_heap.go | 1 + 2 files changed, 5 insertions(+) (limited to 'pkg/tcpip/transport') diff --git a/pkg/tcpip/transport/tcp/rcv.go b/pkg/tcpip/transport/tcp/rcv.go index 958f03ac1..d80aff1b6 100644 --- a/pkg/tcpip/transport/tcp/rcv.go +++ b/pkg/tcpip/transport/tcp/rcv.go @@ -195,6 +195,10 @@ func (r *receiver) consumeSegment(s *segment, segSeq seqnum.Value, segLen seqnum for i := first; i < len(r.pendingRcvdSegments); i++ { r.pendingRcvdSegments[i].decRef() + // Note that slice truncation does not allow garbage collection of + // truncated items, thus truncated items must be set to nil to avoid + // memory leaks. + r.pendingRcvdSegments[i] = nil } r.pendingRcvdSegments = r.pendingRcvdSegments[:first] diff --git a/pkg/tcpip/transport/tcp/segment_heap.go b/pkg/tcpip/transport/tcp/segment_heap.go index 9fd061d7d..e28f213ba 100644 --- a/pkg/tcpip/transport/tcp/segment_heap.go +++ b/pkg/tcpip/transport/tcp/segment_heap.go @@ -41,6 +41,7 @@ func (h *segmentHeap) Pop() interface{} { old := *h n := len(old) x := old[n-1] + old[n-1] = nil *h = old[:n-1] return x } -- cgit v1.2.3