ati: check x y display parameter values
PATCH v2 1/1 ati: check x y display parameter values
From: Prasad J Pandit <[email protected]>
The source and destination x,y display parameters in ati_2d_blt() may run off the vga limits if either of s->regs.[src|dst]_[xy] is zero. Check the parameter values to avoid potential crash.
Reported-by Gaoning Pan <[email protected]>
Signed-off-by Prasad J Pandit <[email protected]>
--- hw/display/ati_2d.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Update v2: add [dst|src]_[xy] > 0x3fff check
-> https://lists.nongnu.org/archive/html/qemu-devel/2020-10/msg05698.html
hw/display/ati_2d.c +6 -4
@@ -75,8 +75,9 @@ void ati_2d_blt(ATIVGAState *s) dst_stride *= bpp; }uint8_t *end = s->vga.vram_ptr + s->vga.vram_size; -if (dst_bits >= end || dst_bits + dst_x + (dst_y + s->regs.dst_height) * - dst_stride >= end) { +if (dst_x >0x3fff || dst_y >0x3fff || dst_bits >= end + || dst_bits + dst_x + + (dst_y + s->regs.dst_height) * dst_stride >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }
@@ -107,8 +108,9 @@ void ati_2d_blt(ATIVGAState *s) src_bits += s->regs.crtc_offset &0x07ffffff ; src_stride *= bpp; } -if (src_bits >= end || src_bits + src_x + - (src_y + s->regs.dst_height) * src_stride >= end) { +if (src_x >0x3fff || src_y >0x3fff || src_bits >= end + || src_bits + src_x + + (src_y + s->regs.dst_height) * src_stride >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }
--
2.26.2
Quoted 11 lines · P J P
From: Prasad J Pandit <[email protected]>
The source and destination x,y display parameters in
ati_2d_blt()may run off the vga limits if either of s->regs.[src|dst]_[xy] is zero. Check the parameter values to avoid potential crash.Reported-by Gaoning Pan <[email protected]>Signed-off-by Prasad J Pandit <[email protected]>--- hw/display/ati_2d.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Added to fixes queue.
thanks,
Gerd