vt: fix broken display when running aptitude

Mikulas Patocka · gregkh · commit 943210ba807e · 2018-11-08T03:36:40.000-08:00
If you run aptitude on framebuffer console, the display is corrupted. The corruption is caused by the commit d8ae724. The patch adds "offset" to "start" when calling scr_memsetw, but it forgets to do the same addition on a subsequent call to do_update_region. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Fixes: d8ae724 ("vt: preserve unicode values corresponding to screen characters") Reviewed-by: Nicolas Pitre <nico@linaro.org> Cc: stable@vger.kernel.org # 4.19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
@@ -1551,7 +1551,7 @@ static void csi_K(struct vc_data *vc, int vpar)
 	scr_memsetw(start + offset, vc->vc_video_erase_char, 2 * count);
 	vc->vc_need_wrap = 0;
 	if (con_should_update(vc))
-		do_update_region(vc, (unsigned long) start, count);
+		do_update_region(vc, (unsigned long)(start + offset), count);
 }
 
 static void csi_X(struct vc_data *vc, int vpar) /* erase the following vpar positions */

Original file line number	Diff line number	Diff line change
`@@ -1551,7 +1551,7 @@ static void csi_K(struct vc_data *vc, int vpar)`
`1551`	`1551`	`scr_memsetw(start + offset, vc->vc_video_erase_char, 2 * count);`
`1552`	`1552`	`vc->vc_need_wrap = 0;`
`1553`	`1553`	`if (con_should_update(vc))`
`1554`		`- do_update_region(vc, (unsigned long) start, count);`
	`1554`	`+ do_update_region(vc, (unsigned long)(start + offset), count);`
`1555`	`1555`	`}`
`1556`	`1556`
`1557`	`1557`	`static void csi_X(struct vc_data vc, int vpar) / erase the following vpar positions */`