mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 11:36:35 +00:00
vhost/vsock: fix incorrect used length reported to the guest
commit49d8c5ffad
upstream. The "used length" reported by calling vhost_add_used() must be the number of bytes written by the device (using "in" buffers). In vhost_vsock_handle_tx_kick() the device only reads the guest buffers (they are all "out" buffers), without writing anything, so we must pass 0 as "used length" to comply virtio spec. Fixes:433fc58e6b
("VSOCK: Introduce vhost_vsock.ko") Cc: stable@vger.kernel.org Reported-by: Halil Pasic <pasic@linux.ibm.com> Suggested-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Link: https://lore.kernel.org/r/20211122163525.294024-2-sgarzare@redhat.com Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2eacc0acf6
commit
dda227cccf
1 changed files with 1 additions and 1 deletions
|
@ -491,7 +491,7 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work)
|
||||||
virtio_transport_free_pkt(pkt);
|
virtio_transport_free_pkt(pkt);
|
||||||
|
|
||||||
len += sizeof(pkt->hdr);
|
len += sizeof(pkt->hdr);
|
||||||
vhost_add_used(vq, head, len);
|
vhost_add_used(vq, head, 0);
|
||||||
total_len += len;
|
total_len += len;
|
||||||
added = true;
|
added = true;
|
||||||
} while(likely(!vhost_exceeds_weight(vq, ++pkts, total_len)));
|
} while(likely(!vhost_exceeds_weight(vq, ++pkts, total_len)));
|
||||||
|
|
Loading…
Reference in a new issue