Skip to content

Commit 6dafde8

Browse files
mmhalborkmann
authored andcommitted
vsock: Update msg_count on read_skb()
Dequeuing via vsock_transport::read_skb() left msg_count outdated, which then confused SOCK_SEQPACKET recv(). Decrease the counter. Fixes: 634f1a7 ("vsock: support sockmap") Signed-off-by: Michal Luczaj <mhal@rbox.co> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Acked-by: John Fastabend <john.fastabend@gmail.com> Link: https://lore.kernel.org/bpf/20241013-vsock-fixes-for-redir-v2-3-d6577bbfe742@rbox.co
1 parent 3543152 commit 6dafde8

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

net/vmw_vsock/virtio_transport_common.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,9 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto
17231723
}
17241724

17251725
hdr = virtio_vsock_hdr(skb);
1726+
if (le32_to_cpu(hdr->flags) & VIRTIO_VSOCK_SEQ_EOM)
1727+
vvs->msg_count--;
1728+
17261729
virtio_transport_dec_rx_pkt(vvs, le32_to_cpu(hdr->len));
17271730
spin_unlock_bh(&vvs->rx_lock);
17281731

0 commit comments

Comments
 (0)