ati-vga: Fix check for blt outside vram
PATCH 1/1 ati-vga: Fix check for blt outside vram
Fix the check preventing calling pixman functions that would access memory outside allocated vram. The r128 X driver sometimes seem to try blits that span outside vram, this check prevents crashing QEMU in that case. (The r128 X driver may have problems even on real hardware so I'm not sure if it's a client bug or emulation problem but at least QEMU should survive.)
--- hw/display/ati_2d.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/display/ati_2d.c +6 -6
@@ -79,10 +79,10 @@ void ati_2d_blt(ATIVGAState *s) s->regs.dst_width, s->regs.dst_height); end = s->vga.vram_ptr + s->vga.vram_size;if (src_bits >= end || dst_bits >= end || - src_bits + (s->regs.src_y + s->regs.dst_height) * src_stride + - s->regs.src_x >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + src_bits + s->regs.src_x + (s->regs.src_y + s->regs.dst_height) * + src_stride *sizeof (uint32_t ) >= end || + dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) * + dst_stride *sizeof (uint32_t ) >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }
@@ -140,8 +140,8 @@ void ati_2d_blt(ATIVGAState *s) filler); end = s->vga.vram_ptr + s->vga.vram_size;if (dst_bits >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) * + dst_stride *sizeof (uint32_t ) >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }
Signature · 1 line
2.13.7
This patch looks 4.0 worthwhile.
Quoted 44 lines · BALATON Zoltan
Fix the check preventing calling pixman functions that would access memory outside allocated vram. The r128 X driver sometimes seem to try blits that span outside vram, this check prevents crashing QEMU in that case. (The r128 X driver may have problems even on real hardware so I'm not sure if it's a client bug or emulation problem but at least QEMU should survive.)
Signed-off-by BALATON Zoltan <[email protected]>Tested-by Andrew Randrianasulu <[email protected]>--- hw/display/ati_2d.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)hw/display/ati_2d.c +6
-6@@ -79,10 +79,10 @@ void ati_2d_blt(ATIVGAState *s) s->regs.dst_width, s->regs.dst_height); end = s->vga.vram_ptr + s->vga.vram_size;if (src_bits >= end || dst_bits >= end || - src_bits + (s->regs.src_y + s->regs.dst_height) * src_stride + - s->regs.src_x >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + src_bits + s->regs.src_x + (s->regs.src_y + s->regs.dst_height) * + src_stride *sizeof (uint32_t ) >= end || + dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) * + dst_stride *sizeof (uint32_t ) >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }@@ -140,8 +140,8 @@ void ati_2d_blt(ATIVGAState *s) filler); end = s->vga.vram_ptr + s->vga.vram_size;if (dst_bits >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) * + dst_stride *sizeof (uint32_t ) >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }
Quoted 1 line · Philippe Mathieu-Daudé
This patch looks 4.0 worthwhile.
Now that it seems we'll have another rc, will this get in? Gerd, I think you have to send a pull request with it for that.
Regards,
BALATON Zoltan
Quoted 47 lines · BALATON Zoltan
Quoted 44 lines
Fix the check preventing calling pixman functions that would access memory outside allocated vram. The r128 X driver sometimes seem to try blits that span outside vram, this check prevents crashing QEMU in that case. (The r128 X driver may have problems even on real hardware so I'm not sure if it's a client bug or emulation problem but at least QEMU should survive.)
Signed-off-by BALATON Zoltan <[email protected]>Tested-by Andrew Randrianasulu <[email protected]>--- hw/display/ati_2d.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)hw/display/ati_2d.c +6
-6@@ -79,10 +79,10 @@ void ati_2d_blt(ATIVGAState *s) s->regs.dst_width, s->regs.dst_height); end = s->vga.vram_ptr + s->vga.vram_size;if (src_bits >= end || dst_bits >= end || - src_bits + (s->regs.src_y + s->regs.dst_height) * src_stride + - s->regs.src_x >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + src_bits + s->regs.src_x + (s->regs.src_y + s->regs.dst_height) * + src_stride *sizeof (uint32_t ) >= end || + dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) * + dst_stride *sizeof (uint32_t ) >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }@@ -140,8 +140,8 @@ void ati_2d_blt(ATIVGAState *s) filler); end = s->vga.vram_ptr + s->vga.vram_size;if (dst_bits >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) * + dst_stride *sizeof (uint32_t ) >= end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return ; }
Quoted 4 lines · BALATON Zoltan
Quoted 1 line · Philippe Mathieu-Daudé
This patch looks 4.0 worthwhile.
Now that it seems we'll have another rc, will this get in? Gerd, I think you have to send a pull request with it for that.
Ping? This has missed two rc-s. This prevents a crash so you might want to queue it for stable as well now.
Regards,
BALATON Zoltan
Quoted 58 lines
Quoted 56 lines · BALATON Zoltan
Quoted 52 lines
Fix the check preventing calling pixman functions that would access memory outside allocated vram. The r128 X driver sometimes seem to try blits that span outside vram, this check prevents crashing QEMU in that case. (The r128 X driver may have problems even on real hardware so I'm not sure if it's a client bug or emulation problem but at least QEMU should survive.)
Signed-off-by BALATON Zoltan <[email protected]>Tested-by Andrew Randrianasulu <[email protected]>--- hw/display/ati_2d.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)hw/display/ati_2d.c +3
-4@@ -79,10 +79,10 @@ void ati_2d_blt(ATIVGAState *s) s->regs.dst_width, s->regs.dst_height); end = s->vga.vram_ptr + s->vga.vram_size;if (src_bits >= end || dst_bits >= end || - src_bits + (s->regs.src_y + s->regs.dst_height) * src_stride + - s->regs.src_x >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + src_bits + s->regs.src_x + (s->regs.src_y +
s->regs.dst_height) *hw/display/ati_2d.c +2
-0+ src_stride *sizeof (uint32_t ) >= end || + dst_bits + s->regs.dst_x + (s->regs.dst_y +
s->regs.dst_height) *
+dst_stride*sizeof(uint32_t)>= end) {
qemu_log_mask(LOG_UNIMP, "blt outside vram notimplemented\n"); return; }hw/display/ati_2d.c +2
-2@@ -140,8 +140,8 @@ void ati_2d_blt(ATIVGAState *s) filler); end = s->vga.vram_ptr + s->vga.vram_size;if (dst_bits >= end || - dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride + - s->regs.dst_x >= end) { + dst_bits + s->regs.dst_x + (s->regs.dst_y +
s->regs.dst_height) *
+dst_stride*sizeof(uint32_t)>= end) {
qemu_log_mask(LOG_UNIMP, "blt outside vram notimplemented\n"); return; }
Quoted 6 lines · BALATON Zoltan
Fix the check preventing calling pixman functions that would access memory outside allocated vram. The r128 X driver sometimes seem to try blits that span outside vram, this check prevents crashing QEMU in that case. (The r128 X driver may have problems even on real hardware so I'm not sure if it's a client bug or emulation problem but at least QEMU should survive.)
Added to vga queue.
thanks,
Gerd