| Message ID | 1511789372-12672-1-git-send-email-jhansen@vmware.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | VSOCK: Don't set sk_state to TCP_CLOSE before testing it | expand |
On Mon, Nov 27, 2017 at 05:29:32AM -0800, Jorgen Hansen wrote: > A recent commit (3b4477d2dcf2) 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: Jorgen Hansen <jhansen@vmware.com> > --- > net/vmw_vsock/vmci_transport.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Sorry, silly bug on my part! Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
From: Jorgen Hansen <jhansen@vmware.com> Date: Mon, 27 Nov 2017 05:29:32 -0800 > A recent commit (3b4477d2dcf2) 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: Jorgen Hansen <jhansen@vmware.com> Applied.
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 56573dc..a7a73ff 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -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); }
A recent commit (3b4477d2dcf2) 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: Jorgen Hansen <jhansen@vmware.com> --- net/vmw_vsock/vmci_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)