Commit 0064cfb4 authored by Arseniy Krasnov's avatar Arseniy Krasnov Committed by David S. Miller
Browse files

vsock: set EPOLLERR on non-empty error queue 



If socket's error queue is not empty, EPOLLERR must be set. Otherwise,
reader of error queue won't detect data in it using EPOLLERR bit.
Currently for AF_VSOCK this is actual only with MSG_ZEROCOPY, as this
feature is the only user of an error queue of the socket.

Signed-off-by: default avatarArseniy Krasnov <avkrasnov@salutedevices.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85605fb6

net/vmw_vsock/af_vsock.c

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock, 
	poll_wait(file, sk_sleep(sk), wait);

	mask = 0;



	if (sk->sk_err)

	if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))

		/* Signify that there has been an error on this socket. */

		mask |= EPOLLERR;