diff options
| author |   Stefano Garzarella <sgarzare@redhat.com> | 2021-11-22 17:35:24 +0100 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2021-11-24 19:00:28 -0500 |
| commit | 49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8 (patch) | |
| tree | 38e02374a42e37604ae3dcad8f5bbe5711e75d09 | |
| parent | Revert "virtio_ring: validate used buffer length" (diff) | |
| download | linux-dev-49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8.tar.xz linux-dev-49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8.zip | |
vhost/vsock: fix incorrect used length reported to the guest
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: 433fc58e6bf2 ("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>
| -rw-r--r-- | drivers/vhost/vsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 938aefbc75ec..4e3b95af7ee4 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -554,7 +554,7 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work) virtio_transport_free_pkt(pkt); len += sizeof(pkt->hdr); - vhost_add_used(vq, head, len); + vhost_add_used(vq, head, 0); total_len += len; added = true; } while(likely(!vhost_exceeds_weight(vq, ++pkts, total_len))); |