6.6-stable patches

added patches:
	virtio_console-fix-order-of-fields-cols-and-rows.patch

diff --git a/queue-6.6/series b/queue-6.6/series
index 70868e919172d871398b68bfa2310b18923148d1..5c0a2567abccbed50962022967d85378e46c624e 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -727,3 +727,4 @@ mm-damon-tests-core-kunit-handle-alloc-failures-in-damon_test_set_regions.patch
 mm-damon-tests-core-kunit-handle-alloc-failures-in-damon_test_ops_registration.patch
 mm-damon-tests-core-kunit-handle-alloc-failure-on-damon_test_set_attrs.patch
 mm-damon-tests-core-kunit-handle-alloc-failures-in-damon_test_update_monitoring_result.patch
+virtio_console-fix-order-of-fields-cols-and-rows.patch

diff --git a/queue-6.6/virtio_console-fix-order-of-fields-cols-and-rows.patch b/queue-6.6/virtio_console-fix-order-of-fields-cols-and-rows.patch
new file mode 100644 (file)
index 0000000..2ba1d0c
--- /dev/null
+++ b/queue-6.6/virtio_console-fix-order-of-fields-cols-and-rows.patch
@@ -0,0 +1,36 @@
+From 5326ab737a47278dbd16ed3ee7380b26c7056ddd Mon Sep 17 00:00:00 2001
+From: Maximilian Immanuel Brandtner <maxbr@linux.ibm.com>
+Date: Mon, 24 Mar 2025 15:42:46 +0100
+Subject: virtio_console: fix order of fields cols and rows
+
+From: Maximilian Immanuel Brandtner <maxbr@linux.ibm.com>
+
+commit 5326ab737a47278dbd16ed3ee7380b26c7056ddd upstream.
+
+According to section 5.3.6.2 (Multiport Device Operation) of the virtio
+spec(version 1.2) a control buffer with the event VIRTIO_CONSOLE_RESIZE
+is followed by a virtio_console_resize struct containing cols then rows.
+The kernel implements this the wrong way around (rows then cols) resulting
+in the two values being swapped.
+
+Signed-off-by: Maximilian Immanuel Brandtner <maxbr@linux.ibm.com>
+Message-Id: <20250324144300.905535-1-maxbr@linux.ibm.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Cc: Filip Hejsek <filip.hejsek@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/virtio_console.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/char/virtio_console.c
++++ b/drivers/char/virtio_console.c
+@@ -1612,8 +1612,8 @@ static void handle_control_message(struc
+               break;
+       case VIRTIO_CONSOLE_RESIZE: {
+               struct {
+-                      __virtio16 rows;
+                       __virtio16 cols;
++                      __virtio16 rows;
+               } size;
+ 
+               if (!is_console_port(port))