VT_RESIZEX: get rid of field-by-field copyin

[ Upstream commit 1b3bce4d6bf839304a90951b4b25a5863533bf2a ] Signed-off-by: Al Viro <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 97b58fae7919a9759a12f41f90cf513b63c7a410)
OE4T · Aug 4, 2021 · eee2022 · eee2022
1 parent efb97de
commit eee2022
Showing 1 changed file with 6 additions and 19 deletions.
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
@@ -894,25 +894,12 @@ int vt_ioctl(struct tty_struct *tty,
 			if (!vc_cons[i].d)
 				continue;
 			console_lock();
-			vcp = vc_cons[i].d;
-			if (vcp) {
-				int ret;
-				int save_scan_lines = vcp->vc_scan_lines;
-				int save_font_height = vcp->vc_font.height;
-
-				if (v.v_vlin)
-					vcp->vc_scan_lines = v.v_vlin;
-				if (v.v_clin)
-					vcp->vc_font.height = v.v_clin;
-				vcp->vc_resize_user = 1;
-				ret = vc_resize(vcp, v.v_cols, v.v_rows);
-				if (ret) {
-					vcp->vc_scan_lines = save_scan_lines;
-					vcp->vc_font.height = save_font_height;
-					console_unlock();
-					return ret;
-				}
-			}
+			if (v.v_vlin)
+				vc_cons[i].d->vc_scan_lines = v.v_vlin;
+			if (v.v_clin)
+				vc_cons[i].d->vc_font.height = v.v_clin;
+			vc_cons[i].d->vc_resize_user = 1;
+			vc_resize(vc_cons[i].d, v.v_cols, v.v_rows);
 			console_unlock();
 		}
 		break;