ati-vga: Fix check for overflowing vram
PATCH 1/1 ati-vga: Fix check for overflowing vram
Take into account the bytes per pixels when checking for accessing beyond end of vram area.
Signed-off-by BALATON Zoltan <[email protected]>
--- hw/display/ati_2d.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/display/ati_2d.c +3 -4
@@ -146,6 +146,7 @@ static uint32_t make_filler(int bpp, uint32_t color)static bool ati_2d_do_blt (ATI2DCtx *ctx,uint8_t use_pixman) {QemuRect vis_src, vis_dst; +unsigned int x, y, i, j, bypp = ctx->bpp /8 ;if (!ctx->bpp) {qemu_log_mask (LOG_GUEST_ERROR ,"Invalid bpp\n" );
@@ -156,7 +157,7 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)return false; }if (ctx->dst.x >0x3fff || ctx->dst.y >0x3fff || - ctx->dst_bits >= ctx->vram_end || ctx->dst_bits + ctx->dst.x + + ctx->dst_bits >= ctx->vram_end || ctx->dst_bits + ctx->dst.x * bypp + (ctx->dst.y + ctx->dst.height) * ctx->dst_stride >= ctx->vram_end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return false;
@@ -194,7 +195,7 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) }if (!ctx->host_data_active && (vis_src.x >0x3fff || vis_src.y >0x3fff || - ctx->src_bits >= ctx->vram_end || ctx->src_bits + vis_src.x + + ctx->src_bits >= ctx->vram_end || ctx->src_bits + vis_src.x * bypp + (vis_src.y + vis_dst.height) * ctx->src_stride >= ctx->vram_end)) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return false;
@@ -240,7 +241,6 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) fallback = true; }if (fallback) { -unsigned int y, i, j, bypp = ctx->bpp /8 ;for (y =0 ; y < vis_dst.height; y++) { i = vis_dst.x * bypp; j = vis_src.x * bypp;
@@ -299,7 +299,6 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)#endif {/* fallback when pixman failed or we don't want to call it */ -unsigned int x, y, i, bypp = ctx->bpp /8 ;for (y =0 ; y < vis_dst.height; y++) { i = vis_dst.x * bypp + (vis_dst.y + y) * ctx->dst_stride;for (x =0 ; x < vis_dst.width; x++, i += bypp) {
Signature · 1 line
2.41.3
Quoted 5 lines · BALATON Zoltan
Take into account the bytes per pixels when checking for accessing beyond end of vram area.
Signed-off-by BALATON Zoltan <[email protected]>
Reviewed-by Marc-André Lureau <[email protected]>
Quoted 53 lines
--- hw/display/ati_2d.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)hw/display/ati_2d.c +3
-5@@ -146,6 +146,7 @@ static uint32_t make_filler(int bpp, uint32_t color)static bool ati_2d_do_blt (ATI2DCtx *ctx,uint8_t use_pixman) {QemuRect vis_src, vis_dst; +unsigned int x, y, i, j, bypp = ctx->bpp /8 ;if (!ctx->bpp) {qemu_log_mask (LOG_GUEST_ERROR ,"Invalid bpp\n" );@@ -156,7 +157,7 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)return false; }if (ctx->dst.x >0x3fff || ctx->dst.y >0x3fff || - ctx->dst_bits >= ctx->vram_end || ctx->dst_bits + ctx->dst.x + + ctx->dst_bits >= ctx->vram_end || ctx->dst_bits + ctx->dst.x * bypp + (ctx->dst.y + ctx->dst.height) * ctx->dst_stride >= ctx->vram_end) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return false;@@ -194,7 +195,7 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) }if (!ctx->host_data_active && (vis_src.x >0x3fff || vis_src.y >0x3fff || - ctx->src_bits >= ctx->vram_end || ctx->src_bits + vis_src.x + + ctx->src_bits >= ctx->vram_end || ctx->src_bits + vis_src.x * bypp + (vis_src.y + vis_dst.height) * ctx->src_stride >= ctx->vram_end)) {qemu_log_mask (LOG_UNIMP ,"blt outside vram not implemented\n" );return false;@@ -240,7 +241,6 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) fallback = true; }if (fallback) { -unsigned int y, i, j, bypp = ctx->bpp /8 ;for (y =0 ; y < vis_dst.height; y++) { i = vis_dst.x * bypp; j = vis_src.x * bypp;@@ -299,7 +299,6 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)#endif {/* fallback when pixman failed or we don't want to call it */ -unsigned int x, y, i, bypp = ctx->bpp /8 ;for (y =0 ; y < vis_dst.height; y++) { i = vis_dst.x * bypp + (vis_dst.y + y) * ctx->dst_stride;for (x =0 ; x < vis_dst.width; x++, i += bypp) { --2.41.3