aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-10-03 05:00:17 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-27 10:00:31 -0400
commit42acfc6615f47e465731c263bee0c799edb098f2 (patch)
tree7c2edab281d3c0933742625c66767ebc5ac8bc1a
parent07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff)
tty: vt, fix bogus division in csi_J
In csi_J(3), the third parameter of scr_memsetw (vc_screenbuf_size) is divided by 2 inappropriatelly. But scr_memsetw expects size, not count, because it divides the size by 2 on its own before doing actual memset-by-words. So remove the bogus division. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Petr Písař <ppisar@redhat.com> Fixes: f8df13e0a9 (tty: Clean console safely) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/vt/vt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 06fb39c1d6dd..ae203c2cd15a 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1176,7 +1176,7 @@ static void csi_J(struct vc_data *vc, int vpar)
1176 break; 1176 break;
1177 case 3: /* erase scroll-back buffer (and whole display) */ 1177 case 3: /* erase scroll-back buffer (and whole display) */
1178 scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char, 1178 scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
1179 vc->vc_screenbuf_size >> 1); 1179 vc->vc_screenbuf_size);
1180 set_origin(vc); 1180 set_origin(vc);
1181 if (con_is_visible(vc)) 1181 if (con_is_visible(vc))
1182 update_screen(vc); 1182 update_screen(vc);