Skip to content

Commit

Permalink
vsock: fix possible infinite sleep in vsock_connectible_wait_data()
Browse files Browse the repository at this point in the history
[ Upstream commit 466a853 ]

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: b3f7fd5 ("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>
  • Loading branch information
dcui authored and gregkh committed Nov 10, 2022
1 parent 0ed71af commit d153d46
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/vmw_vsock/af_vsock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1897,8 +1897,11 @@ static int vsock_connectible_wait_data(struct sock *sk,
err = 0;
transport = vsk->transport;

while ((data = vsock_connectible_has_data(vsk)) == 0) {
while (1) {
prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE);
data = vsock_connectible_has_data(vsk);
if (data != 0)
break;

if (sk->sk_err != 0 ||
(sk->sk_shutdown & RCV_SHUTDOWN) ||
Expand Down

0 comments on commit d153d46

Please sign in to comment.