cirrus: handle wraparound in cirrus_invalidate_region
PATCH v2 1/1 cirrus: handle wraparound in cirrus_invalidate_region
Code simply asserts that there is no wraparound instead of handling it properly. The assert() can be triggered by the guest (must be privilidged inside the guest though). Fix it.
Cc Li Qiang <[email protected]>
Reported-by Philippe Mathieu-Daudé <[email protected]>
Signed-off-by Gerd Hoffmann <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
--- hw/display/cirrus_vga.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
hw/display/cirrus_vga.c +9 -3
@@ -640,10 +640,16 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin, }for (y =0 ; y < lines; y++) { - off_cur = off_begin; + off_cur = off_begin & s->cirrus_addr_mask; off_cur_end = ((off_cur + bytesperline -1 ) & s->cirrus_addr_mask) +1 ; -assert (off_cur_end >= off_cur); -memory_region_set_dirty (&s->vga.vram, off_cur, off_cur_end - off_cur); +if (off_cur_end >= off_cur) { +memory_region_set_dirty (&s->vga.vram, off_cur, off_cur_end - off_cur); + }else { +/* wraparound */ +memory_region_set_dirty (&s->vga.vram, off_cur, + s->cirrus_addr_mask +1 - off_cur); +memory_region_set_dirty (&s->vga.vram,0 , off_cur_end); + } off_begin += off_pitch; } }
Signature · 1 line
2.27.0
Quoted 10 lines · Gerd Hoffmann <[email protected]> 于2020年9月1日周二 下午10:12写道:
Code simply asserts that there is no wraparound instead of handling it properly. The
assert()can be triggered by the guest (must be privilidged inside the guest though). Fix it.Cc Li Qiang <[email protected]>Reported-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Li Qiang <[email protected]>
Quoted 32 lines
--- hw/display/cirrus_vga.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)hw/display/cirrus_vga.c +9
-4@@ -640,10 +640,16 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin, }for (y =0 ; y < lines; y++) { - off_cur = off_begin; + off_cur = off_begin & s->cirrus_addr_mask; off_cur_end = ((off_cur + bytesperline -1 ) & s->cirrus_addr_mask) +1 ; -assert (off_cur_end >= off_cur); -memory_region_set_dirty (&s->vga.vram, off_cur, off_cur_end - off_cur); +if (off_cur_end >= off_cur) { +memory_region_set_dirty (&s->vga.vram, off_cur, off_cur_end - off_cur); + }else { +/* wraparound */ +memory_region_set_dirty (&s->vga.vram, off_cur, + s->cirrus_addr_mask +1 - off_cur); +memory_region_set_dirty (&s->vga.vram,0 , off_cur_end); + } off_begin += off_pitch; } } --2.27.0