diff options
| author | Michal Luczaj <mhal@rbox.co> | 2024-10-13 19:26:41 +0300 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2024-10-17 14:02:54 +0300 |
| commit | 6dafde852df8de3617d4b9f835b629aaeaccd01d (patch) | |
| tree | 942ea02d5b18dbb4ea5124e6d3d745337d7c1e46 | |
| parent | 3543152f2d330141d9394d28855cb90b860091d2 (diff) | |
| download | linux-6dafde852df8de3617d4b9f835b629aaeaccd01d.tar.xz | |
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: 634f1a7110b4 ("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
| -rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 2e5ad96825cc..ccbd2bc0d210 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1723,6 +1723,9 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto } hdr = virtio_vsock_hdr(skb); + if (le32_to_cpu(hdr->flags) & VIRTIO_VSOCK_SEQ_EOM) + vvs->msg_count--; + virtio_transport_dec_rx_pkt(vvs, le32_to_cpu(hdr->len)); spin_unlock_bh(&vvs->rx_lock); |