Commit d5afa82c authored by Sunil Muthuswamy's avatar Sunil Muthuswamy Committed by David S. Miller
Browse files

vsock: correct removal of socket from the list 



The current vsock code for removal of socket from the list is both
subject to race and inefficient. It takes the lock, checks whether
the socket is in the list, drops the lock and if the socket was on the
list, deletes it from the list. This is subject to race because as soon
as the lock is dropped once it is checked for presence, that condition
cannot be relied upon for any decision. It is also inefficient because
if the socket is present in the list, it takes the lock twice.

Signed-off-by: default avatarSunil Muthuswamy <sunilmut@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3733263

net/vmw_vsock/af_vsock.c

+7 −31
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ EXPORT_SYMBOL_GPL(vsock_insert_connected); 
void vsock_remove_bound(struct vsock_sock *vsk)

{

	spin_lock_bh(&vsock_table_lock);

	if (__vsock_in_bound_table(vsk))

		__vsock_remove_bound(vsk);

	spin_unlock_bh(&vsock_table_lock);

}
@@ -290,6 +291,7 @@ EXPORT_SYMBOL_GPL(vsock_remove_bound); 
void vsock_remove_connected(struct vsock_sock *vsk)

{

	spin_lock_bh(&vsock_table_lock);

	if (__vsock_in_connected_table(vsk))

		__vsock_remove_connected(vsk);

	spin_unlock_bh(&vsock_table_lock);

}
@@ -326,34 +328,9 @@ struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, 
}

EXPORT_SYMBOL_GPL(vsock_find_connected_socket);



static bool vsock_in_bound_table(struct vsock_sock *vsk)

{

	bool ret;



	spin_lock_bh(&vsock_table_lock);

	ret = __vsock_in_bound_table(vsk);

	spin_unlock_bh(&vsock_table_lock);



	return ret;

}



static bool vsock_in_connected_table(struct vsock_sock *vsk)

{

	bool ret;



	spin_lock_bh(&vsock_table_lock);

	ret = __vsock_in_connected_table(vsk);

	spin_unlock_bh(&vsock_table_lock);



	return ret;

}



void vsock_remove_sock(struct vsock_sock *vsk)

{

	if (vsock_in_bound_table(vsk))

	vsock_remove_bound(vsk);



	if (vsock_in_connected_table(vsk))

	vsock_remove_connected(vsk);

}

EXPORT_SYMBOL_GPL(vsock_remove_sock);
@@ -485,7 +462,6 @@ static void vsock_pending_work(struct work_struct *work) 
	 * incoming packets can't find this socket, and to reduce the reference

	 * count.

	 */

	if (vsock_in_connected_table(vsk))

	vsock_remove_connected(vsk);



	sk->sk_state = TCP_CLOSE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE