vsock: reset socket state when de-assigning the transport

commit a24009bc9be60242651a21702609381b5092459e upstream.

Transport's release() and destruct() are called when de-assigning the
vsock transport. These callbacks can touch some socket state like
sock flags, sk_state, and peer_shutdown.

Since we are reassigning the socket to a new transport during
vsock_connect(), let's reset these fields to have a clean state with
the new transport.

Fixes: c0cfa2d8a788 ("vsock: add multi-transports support")
Cc: stable@vger.kernel.org
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Luigi Leonardi <leonardi@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 9a65a2f195853ee878095d9f8bdade49a26e3b08..72be32ecc0ad88a21e73dcefac29aaf5445b96ee 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -482,6 +482,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
                 */
                vsk->transport->release(vsk);
                vsock_deassign_transport(vsk);
+
+               /* transport's release() and destruct() can touch some socket
+                * state, since we are reassigning the socket to a new transport
+                * during vsock_connect(), let's reset these fields to have a
+                * clean state.
+                */
+               sock_reset_flag(sk, SOCK_DONE);
+               sk->sk_state = TCP_CLOSE;
+               vsk->peer_shutdown = 0;
        }
 
        /* We increase the module refcnt to prevent the transport unloading