4.9-stable patches

added patches:
	vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index 8536922b00e11e04163426b685d5ec3c20998094..4fa6012153e947f11e6875cd1553250585a19172 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -21,3 +21,4 @@ pm-hibernate-use-correct-mode-for-swsusp_close.patch
 tcp_cubic-fix-spurious-hystart-ack-train-detections-.patch
 tracing-check-pid-filtering-when-creating-events.patch
 hugetlbfs-flush-tlbs-correctly-after-huge_pmd_unshare.patch
+vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch

diff --git a/queue-4.9/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch b/queue-4.9/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch
new file mode 100644 (file)
index 0000000..b3fcde4
--- /dev/null
+++ b/queue-4.9/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch
@@ -0,0 +1,42 @@
+From 49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8 Mon Sep 17 00:00:00 2001
+From: Stefano Garzarella <sgarzare@redhat.com>
+Date: Mon, 22 Nov 2021 17:35:24 +0100
+Subject: vhost/vsock: fix incorrect used length reported to the guest
+
+From: Stefano Garzarella <sgarzare@redhat.com>
+
+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 <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>
+
+---
+ drivers/vhost/vsock.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/vhost/vsock.c
++++ b/drivers/vhost/vsock.c
+@@ -406,7 +406,7 @@ static void vhost_vsock_handle_tx_kick(s
+               else
+                       virtio_transport_free_pkt(pkt);
+ 
+-              vhost_add_used(vq, head, sizeof(pkt->hdr) + len);
++              vhost_add_used(vq, head, 0);
+               added = true;
+       }
+