eaa6ce4fe2
CVE-2017-5525: audio: memory leakage in ac97 (bz #1414110) CVE-2017-5526: audio: memory leakage in es1370 (bz #1414210) CVE-2016-10155 watchdog: memory leakage in i6300esb (bz #1415200) CVE-2017-5552: virtio-gpu-3d: memory leakage (bz #1415283) CVE-2017-5578: virtio-gpu: memory leakage (bz #1415797) CVE-2017-5667: sd: sdhci OOB access during multi block transfer (bz #1417560) CVE-2017-5856: scsi: megasas: memory leakage (bz #1418344) CVE-2017-5857: virtio-gpu-3d: host memory leakage in virgl_cmd_resource_unref (bz #1418383) CVE-2017-5898: usb: integer overflow in emulated_apdu_from_guest (bz #1419700) CVE-2017-5987: sd: infinite loop issue in multi block transfers (bz #1422001) CVE-2017-6058: vmxnet3: OOB access when doing vlan stripping (bz #1423359) CVE-2017-6505: usb: an infinite loop issue in ohci_service_ed_list (bz #1429434) CVE-2017-2615: cirrus: oob access while doing bitblt copy backward (bz #1418206) CVE-2017-2620: cirrus: potential arbitrary code execution (bz #1425419) Fix spice GL with new mesa/libglvnd (bz #1431905)
101 lines
3.3 KiB
Diff
101 lines
3.3 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Thu, 9 Feb 2017 14:02:21 +0100
|
|
Subject: [PATCH] Revert "cirrus: allow zero source pitch in pattern fill rops"
|
|
|
|
This reverts commit 5858dd1801883309bdd208d72ddb81c4e9fee30c.
|
|
|
|
Conflicts:
|
|
hw/display/cirrus_vga.c
|
|
|
|
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: 1486645341-5010-2-git-send-email-kraxel@redhat.com
|
|
(cherry picked from commit 12e97ec39931e5321645fd483ab761319d48bf16)
|
|
---
|
|
hw/display/cirrus_vga.c | 26 ++++++++------------------
|
|
1 file changed, 8 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
index 6bd13fc..0e47cf8 100644
|
|
--- a/hw/display/cirrus_vga.c
|
|
+++ b/hw/display/cirrus_vga.c
|
|
@@ -272,6 +272,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s);
|
|
static bool blit_region_is_unsafe(struct CirrusVGAState *s,
|
|
int32_t pitch, int32_t addr)
|
|
{
|
|
+ if (!pitch) {
|
|
+ return true;
|
|
+ }
|
|
if (pitch < 0) {
|
|
int64_t min = addr
|
|
+ ((int64_t)s->cirrus_blt_height - 1) * pitch
|
|
@@ -290,11 +293,8 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s,
|
|
return false;
|
|
}
|
|
|
|
-static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
|
|
- bool zero_src_pitch_ok)
|
|
+static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
|
|
{
|
|
- int32_t check_pitch;
|
|
-
|
|
/* should be the case, see cirrus_bitblt_start */
|
|
assert(s->cirrus_blt_width > 0);
|
|
assert(s->cirrus_blt_height > 0);
|
|
@@ -303,10 +303,6 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
|
|
return true;
|
|
}
|
|
|
|
- if (!s->cirrus_blt_dstpitch) {
|
|
- return true;
|
|
- }
|
|
-
|
|
if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
|
|
s->cirrus_blt_dstaddr)) {
|
|
return true;
|
|
@@ -314,13 +310,7 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
|
|
if (dst_only) {
|
|
return false;
|
|
}
|
|
-
|
|
- check_pitch = s->cirrus_blt_srcpitch;
|
|
- if (!zero_src_pitch_ok && !check_pitch) {
|
|
- check_pitch = s->cirrus_blt_width;
|
|
- }
|
|
-
|
|
- if (blit_region_is_unsafe(s, check_pitch,
|
|
+ if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch,
|
|
s->cirrus_blt_srcaddr)) {
|
|
return true;
|
|
}
|
|
@@ -715,7 +705,7 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState *s, bool videosrc)
|
|
src = s->cirrus_bltbuf;
|
|
}
|
|
|
|
- if (blit_is_unsafe(s, true, true)) {
|
|
+ if (blit_is_unsafe(s, true)) {
|
|
return 0;
|
|
}
|
|
|
|
@@ -734,7 +724,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop)
|
|
{
|
|
cirrus_fill_t rop_func;
|
|
|
|
- if (blit_is_unsafe(s, true, true)) {
|
|
+ if (blit_is_unsafe(s, true)) {
|
|
return 0;
|
|
}
|
|
rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1];
|
|
@@ -834,7 +824,7 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
|
|
|
|
static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
|
|
{
|
|
- if (blit_is_unsafe(s, false, false))
|
|
+ if (blit_is_unsafe(s, false))
|
|
return 0;
|
|
|
|
return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,
|