diff options
| author | Arseniy Krasnov <avkrasnov@salutedevices.com> | 2023-10-10 21:15:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-10-15 14:19:42 +0200 |
| commit | 0064cfb44084ba98927d8e72340ab78e5887462b (patch) | |
| tree | 9d35780983a555a459cea3a770902f9cdf2d0889 /net/vmw_vsock | |
| parent | appletalk: remove special handling code for ipddp (diff) | |
| download | linux-0064cfb44084ba98927d8e72340ab78e5887462b.tar.xz linux-0064cfb44084ba98927d8e72340ab78e5887462b.zip | |
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: Arseniy Krasnov <avkrasnov@salutedevices.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 013b65241b65..d841f4de33b0 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -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; |