From 967e1ad64e1b7f1b504ac28367f4625b5929cd35 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 27 Nov 2025 14:28:56 +0100 Subject: [PATCH] 6.17-stable patches added patches: tty-vt-fix-up-incorrect-backport-to-stable-releases.patch --- queue-6.17/series | 1 + ...ncorrect-backport-to-stable-releases.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 queue-6.17/tty-vt-fix-up-incorrect-backport-to-stable-releases.patch diff --git a/queue-6.17/series b/queue-6.17/series index ce492c21af..a97047e2a4 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -168,3 +168,4 @@ xfs-fix-out-of-bounds-memory-read-error-in-symlink-repair.patch mptcp-fix-address-removal-logic-in-mptcp_pm_nl_rm_addr.patch drm-amd-display-insert-dccg-log-for-easy-debug.patch drm-amd-display-prevent-gating-dtbclk-before-it-is-properly-latched.patch +tty-vt-fix-up-incorrect-backport-to-stable-releases.patch diff --git a/queue-6.17/tty-vt-fix-up-incorrect-backport-to-stable-releases.patch b/queue-6.17/tty-vt-fix-up-incorrect-backport-to-stable-releases.patch new file mode 100644 index 0000000000..46495cc36d --- /dev/null +++ b/queue-6.17/tty-vt-fix-up-incorrect-backport-to-stable-releases.patch @@ -0,0 +1,34 @@ +From jariruusu@protonmail.com Thu Nov 27 14:24:48 2025 +From: Jari Ruusu +Date: Sat, 22 Nov 2025 07:28:00 +0000 +Subject: tty/vt: fix up incorrect backport to stable releases +To: Greg Kroah-Hartman +Cc: Sasha Levin , "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Zizhi Wo +Message-ID: <8mT8aJsAQPfUnmI5mmsgbUweQAptUFDu5XqhrxPPI1DgJr7GPpbwrpQQW22Nj7fsBc5M5YKG8g0EceNQ_b3d-RPhk6RSQgGCqvaVzzWSIQw=@protonmail.com> + + +Below is a patch for 6.12.58+ and 6.17.8+ stable branches only. +Upstream does not need this. + +Signed-off-by: Jari Ruusu +Fixes: da7e8b382396 ("tty/vt: Add missing return value for VT_RESIZE in vt_ioctl()") +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/vt/vt_ioctl.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/tty/vt/vt_ioctl.c ++++ b/drivers/tty/vt/vt_ioctl.c +@@ -924,8 +924,10 @@ int vt_ioctl(struct tty_struct *tty, + if (vc) { + /* FIXME: review v tty lock */ + ret = __vc_resize(vc_cons[i].d, cc, ll, true); +- if (ret) ++ if (ret) { ++ console_unlock(); + return ret; ++ } + } + } + console_unlock(); -- 2.47.3