d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt: bound buffer access in redraw optimization

Browse Source 
PR:		248628
Reported by:	oleg
Reviewed by:	cem, oleg (both earlier)
Fixes:		ee97b2336a ("Speed up vt(4) by keeping...")
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D32059
This commit is contained in:
Ed Maste 2021-09-22 14:41:00 -04:00
parent 414499b3f9
commit dbc7ca5945
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/vt/hw/fb/vt_fb.c
View File

@ -354,6 +354,9 @@ vt_fb_bitblt_text(struct vt_device *vd, const struct vt_window *vw,
VTBUF_ISCURSOR(&vw->vw_buf, row, col), &fg, &bg);
z = row * PIXEL_WIDTH(VT_FB_MAX_WIDTH) + col;
if (z >= PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) *
PIXEL_WIDTH(VT_FB_MAX_WIDTH))
continue;
if (vd->vd_drawn && (vd->vd_drawn[z] == c) &&
vd->vd_drawnfg && (vd->vd_drawnfg[z] == fg) &&
vd->vd_drawnbg && (vd->vd_drawnbg[z] == bg))
@ -404,6 +407,9 @@ vt_fb_invalidate_text(struct vt_device *vd, const term_rect_t *area)
for (col = area->tr_begin.tp_col; col < area->tr_end.tp_col;
++col) {
z = row * PIXEL_WIDTH(VT_FB_MAX_WIDTH) + col;
if (z >= PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) *
PIXEL_WIDTH(VT_FB_MAX_WIDTH))
continue;
if (vd->vd_drawn)
vd->vd_drawn[z] = 0;
if (vd->vd_drawnfg)

6
sys/dev/vt/hw/vga/vt_vga.c
View File

@ -888,6 +888,9 @@ vga_bitblt_text_txtmode(struct vt_device *vd, const struct vt_window *vw,
&fg, &bg);
z = row * PIXEL_WIDTH(VT_FB_MAX_WIDTH) + col;
if (z >= PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) *
PIXEL_WIDTH(VT_FB_MAX_WIDTH))
continue;
if (vd->vd_drawn && (vd->vd_drawn[z] == c) &&
vd->vd_drawnfg && (vd->vd_drawnfg[z] == fg) &&
vd->vd_drawnbg && (vd->vd_drawnbg[z] == bg))
@ -941,6 +944,9 @@ vga_invalidate_text(struct vt_device *vd, const term_rect_t *area)
col < area->tr_end.tp_col;
++col) {
z = row * PIXEL_WIDTH(VT_FB_MAX_WIDTH) + col;
if (z >= PIXEL_HEIGHT(VT_FB_MAX_HEIGHT) *
PIXEL_WIDTH(VT_FB_MAX_WIDTH))
continue;
if (vd->vd_drawn)
vd->vd_drawn[z] = 0;
if (vd->vd_drawnfg)