Unverified Commit ec11b263 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10186 vsock: remove vsock from connected table when connect is interrupted by a signal 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/744AVVUFQ5T5WXZAM45JJWUTVZPYGHYY/ 
 
https://gitee.com/src-openeuler/kernel/issues/IADGJZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/10186

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 026ce400 6453cc3d

net/vmw_vsock/af_vsock.c

+1 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,7 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr, 
			sk->sk_state = sk->sk_state == TCP_ESTABLISHED ? TCP_CLOSING : TCP_CLOSE;

			sock->state = SS_UNCONNECTED;

			vsock_transport_cancel_pkt(vsk);

			vsock_remove_connected(vsk);

			goto out_wait;

		} else if (timeout == 0) {

			err = -ETIMEDOUT;