vt: fix memory overlapping when deleting chars in the buffer
PATCH 1/1 vt: fix memory overlapping when deleting chars in the buffer
A memory overlapping copy occurs when deleting a long line. Fix it by using scr_memmovew.
--- 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
Greg Kroah-Hartman
maintainerQuoted 4 lines · Yangxi Xiang
A memory overlapping copy occurs when deleting a long line. Fix it by using
scr_memmovew.Signed-off-by Yangxi Xiang <[email protected]>
What commit does this fix? how was this tested?
thanks,
greg k-h
Quoted 1 line
What commit does this fix? how was this tested?
This bug is triggered by running a dynamic analysis on the kernel, with the help of sanitizer to observe this bug. 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.
Yangxi Xiang
Greg Kroah-Hartman
maintainerQuoted 7 lines · Yangxi Xiang
Quoted 1 line
What commit does this fix? how was this tested?
This bug is triggered by running a dynamic analysis on the kernel, with the help of sanitizer to observe this bug. 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.
And what commit id does this fix, or has it always been broken?
thanks,
greg k-h
Quoted 1 line
And what commit id does this fix, or has it always been broken?
It fixes the commit 81732c3 (tty vt: Fix line garbage in virtual console on command line edition). The line buffer is not always broken, because the memcpy utilized the hardware acceleration, whose result is not deterministic. I fix this issue by replacing the scr_memcpyw with scr_memmovew used in insert_char, and preserving the memcpy optimization when the buffers are not overlapping.
Yangxi Xiang
Greg Kroah-Hartman
maintainerQuoted 8 lines · Yangxi Xiang
Quoted 1 line
And what commit id does this fix, or has it always been broken?
It fixes the commit 81732c3 (tty vt: Fix line garbage in virtual console on command line edition). The line buffer is not always broken, because the memcpy utilized the hardware acceleration, whose result is not deterministic. I fix this issue by replacing the
scr_memcpywwithscr_memmovewused ininsert_char, and preserving the memcpy optimization when the buffers are not overlapping.
Great, can you please resend the patch with that information all in it, and the proper Fixes: line tag added?
thanks,
greg k-h