bpf, vsock: Fix poll() missing a queue

mmhal · Alexei Starovoitov · commit 9f0fc9814521 · 2024-11-25T14:19:14.000-08:00
When a verdict program simply passes a packet without redirection, sk_msg is enqueued on sk_psock::ingress_msg. Add a missing check to poll(). Fixes: 634f1a7 ("vsock: support sockmap") Signed-off-by: Michal Luczaj <mhal@rbox.co> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Reviewed-by: Luigi Leonardi <leonardi@redhat.com> Link: https://lore.kernel.org/r/20241118-vsock-bpf-poll-close-v1-1-f1b9669cacdc@rbox.co Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: John Fastabend <john.fastabend@gmail.com>
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
@@ -1054,6 +1054,9 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
 		mask |= EPOLLRDHUP;
 	}
 
+	if (sk_is_readable(sk))
+		mask |= EPOLLIN | EPOLLRDNORM;
+
 	if (sock->type == SOCK_DGRAM) {
 		/* For datagram sockets we can read if there is something in
 		 * the queue and write as long as the socket isn't shutdown for

Original file line number	Diff line number	Diff line change
`@@ -1054,6 +1054,9 @@ static __poll_t vsock_poll(struct file file, struct socket sock,`
`1054`	`1054`	`mask \|= EPOLLRDHUP;`
`1055`	`1055`	`}`
`1056`	`1056`
	`1057`	`+ if (sk_is_readable(sk))`
	`1058`	`+ mask \|= EPOLLIN \| EPOLLRDNORM;`
	`1059`	`+`
`1057`	`1060`	`if (sock->type == SOCK_DGRAM) {`
`1058`	`1061`	`/* For datagram sockets we can read if there is something in`
`1059`	`1062`	`* the queue and write as long as the socket isn't shutdown for`