1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 06fb39c1d6dd..8c3bf3d613c0 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -870,10 +870,15 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
         if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
                 return 0;
 
+        if (new_screen_size > (4 << 20))
+                return -EINVAL;
         newscreen = kmalloc(new_screen_size, GFP_USER);
         if (!newscreen)
                 return -ENOMEM;
 
+        if (vc == sel_cons)
+                clear_selection();
+
         old_rows = vc->vc_rows;
         old_row_size = vc->vc_size_row;
 
@@ -1176,7 +1181,7 @@ static void csi_J(struct vc_data *vc, int vpar)
                         break;
                 case 3: /* erase scroll-back buffer (and whole display) */
                         scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
-                                    vc->vc_screenbuf_size >> 1);
+                                    vc->vc_screenbuf_size);
                         set_origin(vc);
                         if (con_is_visible(vc))
                                 update_screen(vc);