vt/vgacon: Check if screen resize request comes from userspace

Various console drivers are able to resize the screen via the con_resize()
hook.  This hook is also visible in userspace via the TIOCWINSZ, VT_RESIZE and
VT_RESIZEX ioctl's.  One particular utility, SVGATextMode, expects that
con_resize() of the VGA console will always return success even if the
resulting screen is not compatible with the hardware.  However, this
particular behavior of the VGA console, as reported in Kernel Bugzilla Bug
7513, can cause undefined behavior if the user starts with a console size
larger than 80x25.

To work around this problem, add an extra parameter to con_resize().  This
parameter is ignored by drivers except for vgacon.  If this parameter is
non-zero, then the resize request came from a VT_RESIZE or VT_RESIZEX ioctl
and vgacon will always return success.  If this parameter is zero, vgacon will
return -EINVAL if the requested size is not compatible with the hardware.  The
latter is the more correct behavior.

With this change, SVGATextMode should still work correctly while in-kernel and
stty resize calls can expect correct behavior from vgacon.

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 22 insertions, 6 deletions

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index edb7002a3216..0d56f8fc105c 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -750,13 +750,15 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
         return 0;
 }
 
-static inline int resize_screen(struct vc_data *vc, int width, int height)
+static inline int resize_screen(struct vc_data *vc, int width, int height,
+                                int user)
 {
         /* Resizes the resolution of the display adapater */
         int err = 0;
 
         if (vc->vc_mode != KD_GRAPHICS && vc->vc_sw->con_resize)
-                err = vc->vc_sw->con_resize(vc, width, height);
+                err = vc->vc_sw->con_resize(vc, width, height, user);
+
         return err;
 }
 
@@ -772,7 +774,7 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
         unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
         unsigned int old_cols, old_rows, old_row_size, old_screen_size;
         unsigned int new_cols, new_rows, new_row_size, new_screen_size;
-        unsigned int end;
+        unsigned int end, user;
         unsigned short *newscreen;
 
         WARN_CONSOLE_UNLOCKED();
@@ -780,6 +782,9 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
         if (!vc)
                 return -ENXIO;
 
+        user = vc->vc_resize_user;
+        vc->vc_resize_user = 0;
+
         if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW)
                 return -EINVAL;
 
@@ -800,7 +805,7 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
         old_row_size = vc->vc_size_row;
         old_screen_size = vc->vc_screenbuf_size;
 
-        err = resize_screen(vc, new_cols, new_rows);
+        err = resize_screen(vc, new_cols, new_rows, user);
         if (err) {
                 kfree(newscreen);
                 return err;
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 7a61a2a9aafe..f69a8258095c 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -847,14 +847,24 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
         case VT_RESIZE:
         {
                 struct vt_sizes __user *vtsizes = up;
+                struct vc_data *vc;
+
                 ushort ll,cc;
                 if (!perm)
                         return -EPERM;
                 if (get_user(ll, &vtsizes->v_rows) ||
                     get_user(cc, &vtsizes->v_cols))
                         return -EFAULT;
-                for (i = 0; i < MAX_NR_CONSOLES; i++)
-                        vc_lock_resize(vc_cons[i].d, cc, ll);
+
+                for (i = 0; i < MAX_NR_CONSOLES; i++) {
+                        vc = vc_cons[i].d;
+
+                        if (vc) {
+                                vc->vc_resize_user = 1;
+                                vc_lock_resize(vc_cons[i].d, cc, ll);
+                        }
+                }
+
                 return 0;
         }
 
@@ -900,6 +910,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                 vc_cons[i].d->vc_scan_lines = vlin;
                         if (clin)
                                 vc_cons[i].d->vc_font.height = clin;
+                        vc_cons[i].d->vc_resize_user = 1;
                         vc_resize(vc_cons[i].d, cc, ll);
                         release_console_sem();
                 }