vt: fix memory overlapping when deleting chars in the buffer
PATCH v3 1/1 vt: fix memory overlapping when deleting chars in the buffer
A memory overlapping copy occurs when deleting a long line. This memory overlapping copy can cause data corruption when scr_memcpyw is optimized to memcpy because memcpy does not ensure its behavior if the destination buffer overlaps with the source buffer. The line buffer is not always broken, because the memcpy utilizes the hardware acceleration, whose result is not deterministic.
Fix this problem by using replacing the scr_memcpyw with scr_memmovew.
---
Changes since v2:
- add more information about this bug and which commit id this fixes
- use scr_memmovew() in both overlapping and not overlapping case.
--- drivers/tty/vt/vt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/vt/vt.c +1 -1
@@ -855,7 +855,7 @@ static void delete_char(struct vc_data *vc, unsigned int nr)unsigned short *p = (unsigned short *) vc->vc_pos;vc_uniscr_delete (vc, nr); -scr_memcpyw (p, p + nr, (vc->vc_cols - vc->state.x - nr) *2 ); +scr_memmovew (p, p + nr, (vc->vc_cols - vc->state.x - nr) *2 );scr_memsetw (p + vc->vc_cols - vc->state.x - nr, vc->vc_video_erase_char, nr *2 ); vc->vc_need_wrap =0 ;
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 10 lines · Yangxi Xiang
A memory overlapping copy occurs when deleting a long line. This memory overlapping copy can cause data corruption when
scr_memcpywis optimized to memcpy because memcpy does not ensure its behavior if the destination buffer overlaps with the source buffer. The line buffer is not always broken, because the memcpy utilizes the hardware acceleration, whose result is not deterministic.Fix this problem by using replacing the
scr_memcpywwithscr_memmovew.Fixes 81732c3b2fed ("Fix line garbage in virtual console")
Nit, this should have been:
otherwise our tools complain. I've fixed it up when applying it.
thanks,
greg k-h