From: Greg Kroah-Hartman Date: Thu, 8 Jan 2026 13:25:19 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.1.160~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2972b6c24ea2c55fcbc92904eca0138b42dd9e;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: virtio_console-fix-order-of-fields-cols-and-rows.patch --- diff --git a/queue-6.12/series b/queue-6.12/series index 8d5276c600..790f47d01e 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -11,3 +11,4 @@ net-remove-rtnl-dance-for-siocbraddif-and-siocbrdelif.patch sched-fair-small-cleanup-to-sched_balance_newidle.patch sched-fair-small-cleanup-to-update_newidle_cost.patch sched-fair-proportional-newidle-balance.patch +virtio_console-fix-order-of-fields-cols-and-rows.patch diff --git a/queue-6.12/virtio_console-fix-order-of-fields-cols-and-rows.patch b/queue-6.12/virtio_console-fix-order-of-fields-cols-and-rows.patch new file mode 100644 index 0000000000..fc179cc247 --- /dev/null +++ b/queue-6.12/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 +Date: Mon, 24 Mar 2025 15:42:46 +0100 +Subject: virtio_console: fix order of fields cols and rows + +From: Maximilian Immanuel Brandtner + +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 +Message-Id: <20250324144300.905535-1-maxbr@linux.ibm.com> +Signed-off-by: Michael S. Tsirkin +Cc: Filip Hejsek +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -1579,8 +1579,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))