vsock: fix possible infinite sleep in vsock_connectible_wait_data()
[ Upstream commit466a85336f
] 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:
Родитель
0ed71af4d0
Коммит
d153d468c4
|
@ -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) ||
|
||||
|
|
Загрузка…
Ссылка в новой задаче