|
 |
ee3a555 |
From 215902d7b6fb50c6fc216fc74f770858278ed904 Mon Sep 17 00:00:00 2001
|
|
|
ee3a555 |
From: hangaohuai <hangaohuai@huawei.com>
|
|
|
ee3a555 |
Date: Tue, 14 Mar 2017 14:39:19 +0800
|
|
|
ee3a555 |
Subject: [PATCH] fix :cirrus_vga fix OOB read case qemu Segmentation fault
|
|
|
ee3a555 |
|
|
|
ee3a555 |
check the validity of parameters in cirrus_bitblt_rop_fwd_transp_xxx
|
|
|
ee3a555 |
and cirrus_bitblt_rop_fwd_xxx to avoid the OOB read which causes qemu Segmentation fault.
|
|
|
ee3a555 |
|
|
|
ee3a555 |
After the fix, we will touch the assert in
|
|
|
ee3a555 |
cirrus_invalidate_region:
|
|
|
ee3a555 |
assert(off_cur_end >= off_cur);
|
|
|
ee3a555 |
|
|
|
ee3a555 |
Signed-off-by: fangying <fangying1@huawei.com>
|
|
|
ee3a555 |
Signed-off-by: hangaohuai <hangaohuai@huawei.com>
|
|
|
ee3a555 |
Message-id: 20170314063919.16200-1-hangaohuai@huawei.com
|
|
|
ee3a555 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
ee3a555 |
---
|
|
|
ee3a555 |
hw/cirrus_vga_rop.h | 10 ++++++++++
|
|
|
ee3a555 |
1 file changed, 10 insertions(+)
|
|
|
ee3a555 |
|
|
|
ee3a555 |
diff --git a/hw/cirrus_vga_rop.h b/hw/cirrus_vga_rop.h
|
|
|
ee3a555 |
index 0925a00..b7447f8 100644
|
|
|
ee3a555 |
--- a/hw/cirrus_vga_rop.h
|
|
|
ee3a555 |
+++ b/hw/cirrus_vga_rop.h
|
|
|
ee3a555 |
@@ -97,6 +97,11 @@ glue(glue(cirrus_bitblt_rop_fwd_transp_, ROP_NAME),_8)(CirrusVGAState *s,
|
|
|
ee3a555 |
src = src_ - src_base;
|
|
|
ee3a555 |
dstpitch -= bltwidth;
|
|
|
ee3a555 |
srcpitch -= bltwidth;
|
|
|
ee3a555 |
+
|
|
|
ee3a555 |
+ if (bltheight > 1 && (dstpitch < 0 || srcpitch < 0)) {
|
|
|
ee3a555 |
+ return;
|
|
|
ee3a555 |
+ }
|
|
|
ee3a555 |
+
|
|
|
ee3a555 |
for (y = 0; y < bltheight; y++) {
|
|
|
ee3a555 |
for (x = 0; x < bltwidth; x++) {
|
|
|
ee3a555 |
p = *(dst_base + m(dst));
|
|
|
ee3a555 |
@@ -143,6 +148,11 @@ glue(glue(cirrus_bitblt_rop_fwd_transp_, ROP_NAME),_16)(CirrusVGAState *s,
|
|
|
ee3a555 |
src = src_ - src_base;
|
|
|
ee3a555 |
dstpitch -= bltwidth;
|
|
|
ee3a555 |
srcpitch -= bltwidth;
|
|
|
ee3a555 |
+
|
|
|
ee3a555 |
+ if (bltheight > 1 && (dstpitch < 0 || srcpitch < 0)) {
|
|
|
ee3a555 |
+ return;
|
|
|
ee3a555 |
+ }
|
|
|
ee3a555 |
+
|
|
|
ee3a555 |
for (y = 0; y < bltheight; y++) {
|
|
|
ee3a555 |
for (x = 0; x < bltwidth; x+=2) {
|
|
|
ee3a555 |
p1 = *(dst_base + m(dst));
|
|
|
ee3a555 |
--
|
|
|
ee3a555 |
1.8.3.1
|
|
|
ee3a555 |
|