tty/vt: fix up incorrect backport to stable releases

jariruusu · gregkh · commit 5dc95f897d06 · 2025-12-01T11:46:08.000+01:00
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 &lt;jariruusu@protonmail.com&gt;
Fixes: da7e8b382396 ("tty/vt: Add missing return value for VT_RESIZE in vt_ioctl()")
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git 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();

Original file line number	Diff line number	Diff line change
`@@ -924,8 +924,10 @@ int vt_ioctl(struct tty_struct *tty,`
`924`	`924`	`if (vc) {`
`925`	`925`	`/* FIXME: review v tty lock */`
`926`	`926`	`ret = __vc_resize(vc_cons[i].d, cc, ll, true);`
`927`		`- if (ret)`
	`927`	`+ if (ret) {`
	`928`	`+ console_unlock();`
`928`	`929`	`return ret;`
	`930`	`+ }`
`929`	`931`	`}`
`930`	`932`	`}`
`931`	`933`	`console_unlock();`