From: Greg Kroah-Hartman Date: Mon, 29 Nov 2021 07:21:28 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.15.6~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec26e43291fb25e502183d85233d40dc229cb136;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch --- diff --git a/queue-5.4/series b/queue-5.4/series index 8d5d6c3f4b0..18a2170d69f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -75,3 +75,4 @@ net-mscc-ocelot-don-t-downgrade-timestamping-rx-filt.patch net-mscc-ocelot-correctly-report-the-timestamping-rx.patch f2fs-set-sbi_need_fsck-flag-when-inconsistent-node-b.patch smb3-do-not-error-on-fsync-when-readonly.patch +vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch diff --git a/queue-5.4/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch b/queue-5.4/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch new file mode 100644 index 00000000000..218117acb30 --- /dev/null +++ b/queue-5.4/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch @@ -0,0 +1,41 @@ +From 49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8 Mon Sep 17 00:00:00 2001 +From: Stefano Garzarella +Date: Mon, 22 Nov 2021 17:35:24 +0100 +Subject: vhost/vsock: fix incorrect used length reported to the guest + +From: Stefano Garzarella + +commit 49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8 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: 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko") +Cc: stable@vger.kernel.org +Reported-by: Halil Pasic +Suggested-by: Jason Wang +Signed-off-by: Stefano Garzarella +Link: https://lore.kernel.org/r/20211122163525.294024-2-sgarzare@redhat.com +Signed-off-by: Michael S. Tsirkin +Reviewed-by: Stefan Hajnoczi +Reviewed-by: Halil Pasic +Signed-off-by: Greg Kroah-Hartman +--- + drivers/vhost/vsock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/vhost/vsock.c ++++ b/drivers/vhost/vsock.c +@@ -491,7 +491,7 @@ static void vhost_vsock_handle_tx_kick(s + 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)));