Commit a24009bc authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Paolo Abeni
Browse files

vsock: reset socket state when de-assigning the transport 



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: c0cfa2d8 ("vsock: add multi-transports support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarLuigi Leonardi <leonardi@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent df137da9

net/vmw_vsock/af_vsock.c

+9 −0
Original line number Diff line number Diff line
@@ -491,6 +491,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