vt: fix memory overlapping when deleting chars in the buffer
PATCH v2 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, and preserving the memcpy optimization when the buffers are not overlapping.
Fixes 81732c3b2fed ("Fix line garbage in virtual console")
Signed-off-by Yangxi Xiang <[email protected]>
---
Changes since v1:
add more information about this bug and which commit id this fixes
--- drivers/tty/vt/vt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/tty/vt/vt.c +5 -1
@@ -853,9 +853,13 @@ static void insert_char(struct vc_data *vc, unsigned int nr)static void delete_char (struct vc_data *vc,unsigned int nr) {unsigned short *p = (unsigned short *) vc->vc_pos; +unsigned short cp = (vc->vc_cols - vc->state.x - nr) *2 ;vc_uniscr_delete (vc, nr); -scr_memcpyw (p, p + nr, (vc->vc_cols - vc->state.x - nr) *2 ); +if (cp > nr) +scr_memmovew (p, p + nr, cp); +else +scr_memcpyw (p, p + nr, cp);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