diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-18 07:13:19 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-18 07:13:19 +0000 |
| commit | 359e4c56571e18e9e6b2618cdd46293aa271666c (patch) | |
| tree | 70fe8d4e39baa56418410ee6d555557a862d2343 /pkg/tcpip | |
| parent | b07f97837cef8b28ea017efba0ad55b7463c00d8 (diff) | |
| parent | 09b2fca40c61f9ec8d6745f422f6f45b399e8f94 (diff) | |
Merge release-20200608.0-81-g09b2fca40 (automated)
Diffstat (limited to 'pkg/tcpip')
| -rw-r--r-- | pkg/tcpip/stack/stack.go | 6 | ||||
| -rw-r--r-- | pkg/tcpip/transport/tcp/timer.go | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/tcpip/stack/stack.go b/pkg/tcpip/stack/stack.go index a2190341c..51abe32a7 100644 --- a/pkg/tcpip/stack/stack.go +++ b/pkg/tcpip/stack/stack.go @@ -1033,14 +1033,14 @@ func (s *Stack) removeNICLocked(id tcpip.NICID) *tcpip.Error { // Remove routes in-place. n tracks the number of routes written. n := 0 for i, r := range s.routeTable { + s.routeTable[i] = tcpip.Route{} if r.NIC != id { // Keep this route. - if i > n { - s.routeTable[n] = r - } + s.routeTable[n] = r n++ } } + s.routeTable = s.routeTable[:n] return nic.remove() diff --git a/pkg/tcpip/transport/tcp/timer.go b/pkg/tcpip/transport/tcp/timer.go index c70525f27..7981d469b 100644 --- a/pkg/tcpip/transport/tcp/timer.go +++ b/pkg/tcpip/transport/tcp/timer.go @@ -85,6 +85,7 @@ func (t *timer) init(w *sleep.Waker) { // cleanup frees all resources associated with the timer. func (t *timer) cleanup() { t.timer.Stop() + *t = timer{} } // checkExpiration checks if the given timer has actually expired, it should be |