summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/transport/tcp/connect.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-02-27 22:19:28 +0000
committergVisor bot <gvisor-bot@google.com>2020-02-27 22:19:28 +0000
commit39007ac80a34a18aefb285fb10b285706dd320c5 (patch)
tree302fbc1981133094ec78f0625ed0605ff7e344f5 /pkg/tcpip/transport/tcp/connect.go
parentd28077cca02f4b9dd58f8d3930a614b8b0f5e757 (diff)
parentc6bdc6b05b4abfcb3c677013496c9a6b1d1365dd (diff)
Merge release-20200219.0-58-gc6bdc6b (automated)
Diffstat (limited to 'pkg/tcpip/transport/tcp/connect.go')
-rw-r--r--pkg/tcpip/transport/tcp/connect.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/tcpip/transport/tcp/connect.go b/pkg/tcpip/transport/tcp/connect.go
index 7730e6445..cd247f3e1 100644
--- a/pkg/tcpip/transport/tcp/connect.go
+++ b/pkg/tcpip/transport/tcp/connect.go
@@ -577,7 +577,7 @@ func (h *handshake) execute() *tcpip.Error {
case wakerForNotification:
n := h.ep.fetchNotifications()
- if n&notifyClose != 0 {
+ if (n&notifyClose)|(n&notifyAbort) != 0 {
return tcpip.ErrAborted
}
if n&notifyDrain != 0 {