summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/transport/tcp/rcv.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-12-03 22:46:03 +0000
committergVisor bot <gvisor-bot@google.com>2019-12-03 22:46:03 +0000
commitff19e9d5ec3a31f00a673f443b5c2fd70f39c50b (patch)
tree53fd654820971723db3bbb611e610223844defa9 /pkg/tcpip/transport/tcp/rcv.go
parent32997d909e183f346e8f9f901112ad158a801b03 (diff)
parent27e2c4ddca553cf6867bd49f2847ef007ac560c0 (diff)
Merge release-20191114.0-55-g27e2c4d (automated)
Diffstat (limited to 'pkg/tcpip/transport/tcp/rcv.go')
-rw-r--r--pkg/tcpip/transport/tcp/rcv.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/tcpip/transport/tcp/rcv.go b/pkg/tcpip/transport/tcp/rcv.go
index 857dc445f..5ee499c36 100644
--- a/pkg/tcpip/transport/tcp/rcv.go
+++ b/pkg/tcpip/transport/tcp/rcv.go
@@ -205,7 +205,7 @@ func (r *receiver) consumeSegment(s *segment, segSeq seqnum.Value, segLen seqnum
// Handle ACK (not FIN-ACK, which we handled above) during one of the
// shutdown states.
- if s.flagIsSet(header.TCPFlagAck) {
+ if s.flagIsSet(header.TCPFlagAck) && s.ackNumber == r.ep.snd.sndNxt {
r.ep.mu.Lock()
switch r.ep.state {
case StateFinWait1: