moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vsock: fix possible infinite sleep in vsock_connectible_wait_data()

Browse Source 
[ Upstream commit 466a85336fee6e3b35eb97b8405a28302fd25809 ]

Currently vsock_connectible_has_data() may miss a wakeup operation
between vsock_connectible_has_data() == 0 and the prepare_to_wait().

Fix the race by adding the process to the wait queue before checking
vsock_connectible_has_data().

Fixes: b3f7fd5488 ("af_vsock: separate wait data loop")
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reported-by: Frédéric Dalleau <frederic.dalleau@docker.com>
Tested-by: Frédéric Dalleau <frederic.dalleau@docker.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dexuan Cui
2022-10-31 19:17:06 -07:00
committed by Greg Kroah-Hartman
parent 0ed71af4d0
commit d153d468c4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/vmw_vsock/af_vsock.c
View File

@@ -1897,8 +1897,11 @@ static int vsock_connectible_wait_data(struct sock *sk,
err = 0; err = 0;
transport = vsk->transport; transport = vsk->transport;
while ((data = vsock_connectible_has_data(vsk)) == 0) { while (1) {
prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE);
data = vsock_connectible_has_data(vsk);
if (data != 0)
break;
if (sk->sk_err != 0 || if (sk->sk_err != 0 ||
(sk->sk_shutdown & RCV_SHUTDOWN) || (sk->sk_shutdown & RCV_SHUTDOWN) ||