Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a5def7f authored by Jorgen Hansen's avatar Jorgen Hansen Committed by David S. Miller
Browse files

VSOCK: Don't set sk_state to TCP_CLOSE before testing it 



A recent commit (3b4477d2) converted the sk_state to use
TCP constants. In that change, vmci_transport_handle_detach
was changed such that sk->sk_state was set to TCP_CLOSE before
we test whether it is TCP_SYN_SENT. This change moves the
sk_state change back to the original locations in that function.

Signed-off-by: default avatarJorgen Hansen <jhansen@vmware.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22dac9f1

net/vmw_vsock/vmci_transport.c

+2 −2
Original line number Diff line number Diff line
@@ -804,8 +804,6 @@ static void vmci_transport_handle_detach(struct sock *sk) 
		 */

		if (vsk->local_addr.svm_cid == VMADDR_CID_HOST ||

		    vsock_stream_has_data(vsk) <= 0) {

			sk->sk_state = TCP_CLOSE;



			if (sk->sk_state == TCP_SYN_SENT) {

				/* The peer may detach from a queue pair while

				 * we are still in the connecting state, i.e.,
@@ -815,10 +813,12 @@ static void vmci_transport_handle_detach(struct sock *sk) 
				 * event like a reset.

				 */



				sk->sk_state = TCP_CLOSE;

				sk->sk_err = ECONNRESET;

				sk->sk_error_report(sk);

				return;

			}

			sk->sk_state = TCP_CLOSE;

		}

		sk->sk_state_change(sk);

	}