From 7b532436fc6464d0260b9c9635eca8f3eca7dbdb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Nov 2021 08:19:16 +0100 Subject: [PATCH] 4.19-stable patches added patches: vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch --- queue-4.19/series | 1 + ...ct-used-length-reported-to-the-guest.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 queue-4.19/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch diff --git a/queue-4.19/series b/queue-4.19/series index 26170c8bbbb..a6d89cbbcbd 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -52,3 +52,4 @@ tcp_cubic-fix-spurious-hystart-ack-train-detections-.patch mips-use-3-level-pgtable-for-64kb-page-size-on-mips_.patch net-smc-don-t-call-clcsock-shutdown-twice-when-smc-s.patch net-hns3-fix-vf-rss-failed-problem-after-pf-enable-m.patch +vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch diff --git a/queue-4.19/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch b/queue-4.19/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch new file mode 100644 index 00000000000..c3f56043f9b --- /dev/null +++ b/queue-4.19/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 +@@ -490,7 +490,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))); -- 2.47.2