]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tty/vt: fix up incorrect backport to stable releases
authorJari Ruusu <jariruusu@protonmail.com>
Sat, 22 Nov 2025 07:28:00 +0000 (07:28 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Dec 2025 10:43:38 +0000 (11:43 +0100)
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 <jariruusu@protonmail.com>
Fixes: da7e8b382396 ("tty/vt: Add missing return value for VT_RESIZE in vt_ioctl()")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/vt_ioctl.c

index 387b691826623ea7494c3e04e88e22f03aff6738..da82a79c1511f67905669e5fe9a3d5b094450bbc 100644 (file)
@@ -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();