queue-4.19/vsock-virtio-set-sock_done-on-peer-shutdown.patch-7251

   1 From 42a9ce27172ea5f3858bf742a60d3c0e352c0018 Mon Sep 17 00:00:00 2001
   2 From: Stephen Barber <smbarber@chromium.org>
   3 Date: Fri, 14 Jun 2019 23:42:37 -0700
   4 Subject: vsock/virtio: set SOCK_DONE on peer shutdown
   5
   6 [ Upstream commit 42f5cda5eaf4396a939ae9bb43bb8d1d09c1b15c ]
   7
   8 Set the SOCK_DONE flag to match the TCP_CLOSING state when a peer has
   9 shut down and there is nothing left to read.
  10
  11 This fixes the following bug:
  12 1) Peer sends SHUTDOWN(RDWR).
  13 2) Socket enters TCP_CLOSING but SOCK_DONE is not set.
  14 3) read() returns -ENOTCONN until close() is called, then returns 0.
  15
  16 Signed-off-by: Stephen Barber <smbarber@chromium.org>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  net/vmw_vsock/virtio_transport_common.c | 4 +++-
  21  1 file changed, 3 insertions(+), 1 deletion(-)
  22
  23 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
  24 index f3f3d06cb6d8..e30f53728725 100644
  25 --- a/net/vmw_vsock/virtio_transport_common.c
  26 +++ b/net/vmw_vsock/virtio_transport_common.c
  27 @@ -871,8 +871,10 @@ virtio_transport_recv_connected(struct sock *sk,
  28                 if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SHUTDOWN_SEND)
  29                         vsk->peer_shutdown |= SEND_SHUTDOWN;
  30                 if (vsk->peer_shutdown == SHUTDOWN_MASK &&
  31 -                   vsock_stream_has_data(vsk) <= 0)
  32 +                   vsock_stream_has_data(vsk) <= 0) {
  33 +                       sock_set_flag(sk, SOCK_DONE);
  34                         sk->sk_state = TCP_CLOSING;
  35 +               }
  36                 if (le32_to_cpu(pkt->hdr.flags))
  37                         sk->sk_state_change(sk);
  38                 break;
  39 --
  40 2.20.1
  41