diff options
| author | Stephen Barber <smbarber@chromium.org> | 2019-06-15 09:42:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-16 00:01:09 +0300 |
| commit | 42f5cda5eaf4396a939ae9bb43bb8d1d09c1b15c (patch) | |
| tree | 682bf98a5b4c1c4721c9ef5f0ee430b9dcaf13a6 /net/vmw_vsock | |
| parent | 760c80b70bed2cd01630e8595d1bbde910339f31 (diff) | |
| download | linux-42f5cda5eaf4396a939ae9bb43bb8d1d09c1b15c.tar.xz | |
vsock/virtio: set SOCK_DONE on peer shutdown
Set the SOCK_DONE flag to match the TCP_CLOSING state when a peer has
shut down and there is nothing left to read.
This fixes the following bug:
1) Peer sends SHUTDOWN(RDWR).
2) Socket enters TCP_CLOSING but SOCK_DONE is not set.
3) read() returns -ENOTCONN until close() is called, then returns 0.
Signed-off-by: Stephen Barber <smbarber@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index f3f3d06cb6d8..e30f53728725 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -871,8 +871,10 @@ virtio_transport_recv_connected(struct sock *sk, if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SHUTDOWN_SEND) vsk->peer_shutdown |= SEND_SHUTDOWN; if (vsk->peer_shutdown == SHUTDOWN_MASK && - vsock_stream_has_data(vsk) <= 0) + vsock_stream_has_data(vsk) <= 0) { + sock_set_flag(sk, SOCK_DONE); sk->sk_state = TCP_CLOSING; + } if (le32_to_cpu(pkt->hdr.flags)) sk->sk_state_change(sk); break; |