|
 |
619821 |
From abfd9c2acaf70c60ec70807ba4d021ade69c7b79 Mon Sep 17 00:00:00 2001
|
|
|
4f5da8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4f5da8 |
Date: Fri, 10 Feb 2017 08:30:14 +0100
|
|
|
4f5da8 |
Subject: [PATCH 2/3] Revert "cirrus: allow zero source pitch in pattern fill
|
|
|
4f5da8 |
rops"
|
|
|
4f5da8 |
|
|
|
4f5da8 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4f5da8 |
Message-id: <1486715415-3462-3-git-send-email-kraxel@redhat.com>
|
|
|
4f5da8 |
Patchwork-id: 73774
|
|
|
4f5da8 |
O-Subject: [virt-devel] [RHEL-7.4 qemu-kvm PATCH 2/3] Revert "cirrus: allow zero source pitch in pattern fill rops"
|
|
|
619821 |
Bugzilla: 1420492
|
|
|
4f5da8 |
CVE: CVE-2017-2620/20170221
|
|
|
4f5da8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4f5da8 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4f5da8 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4f5da8 |
|
|
|
4f5da8 |
This reverts commit 5858dd1801883309bdd208d72ddb81c4e9fee30c.
|
|
|
4f5da8 |
|
|
|
4f5da8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4f5da8 |
|
|
|
4f5da8 |
Conflicts:
|
|
|
4f5da8 |
hw/display/cirrus_vga.c
|
|
|
4f5da8 |
|
|
|
4f5da8 |
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
|
4f5da8 |
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4f5da8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4f5da8 |
|
|
|
4f5da8 |
Upstream: WIP (https://patchwork.ozlabs.org/patch/726074/)
|
|
|
4f5da8 |
---
|
|
|
4f5da8 |
hw/display/cirrus_vga.c | 26 ++++++++------------------
|
|
|
4f5da8 |
1 file changed, 8 insertions(+), 18 deletions(-)
|
|
|
4f5da8 |
|
|
|
4f5da8 |
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
|
4f5da8 |
index fff9bf0..9a9501f 100644
|
|
|
4f5da8 |
--- a/hw/display/cirrus_vga.c
|
|
|
4f5da8 |
+++ b/hw/display/cirrus_vga.c
|
|
|
4f5da8 |
@@ -267,6 +267,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s);
|
|
|
4f5da8 |
static bool blit_region_is_unsafe(struct CirrusVGAState *s,
|
|
|
4f5da8 |
int32_t pitch, int32_t addr)
|
|
|
4f5da8 |
{
|
|
|
4f5da8 |
+ if (!pitch) {
|
|
|
4f5da8 |
+ return true;
|
|
|
4f5da8 |
+ }
|
|
|
4f5da8 |
if (pitch < 0) {
|
|
|
4f5da8 |
int64_t min = addr
|
|
|
4f5da8 |
+ ((int64_t)s->cirrus_blt_height - 1) * pitch
|
|
|
4f5da8 |
@@ -285,11 +288,8 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s,
|
|
|
4f5da8 |
return false;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
|
|
|
4f5da8 |
-static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
|
|
|
4f5da8 |
- bool zero_src_pitch_ok)
|
|
|
4f5da8 |
+static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
|
|
|
4f5da8 |
{
|
|
|
4f5da8 |
- int32_t check_pitch;
|
|
|
4f5da8 |
-
|
|
|
4f5da8 |
/* should be the case, see cirrus_bitblt_start */
|
|
|
4f5da8 |
assert(s->cirrus_blt_width > 0);
|
|
|
4f5da8 |
assert(s->cirrus_blt_height > 0);
|
|
|
4f5da8 |
@@ -298,10 +298,6 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
|
|
|
4f5da8 |
return true;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
|
|
|
4f5da8 |
- if (!s->cirrus_blt_dstpitch) {
|
|
|
4f5da8 |
- return true;
|
|
|
4f5da8 |
- }
|
|
|
4f5da8 |
-
|
|
|
4f5da8 |
if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
|
|
|
4f5da8 |
s->cirrus_blt_dstaddr)) {
|
|
|
4f5da8 |
return true;
|
|
|
4f5da8 |
@@ -309,13 +305,7 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
|
|
|
4f5da8 |
if (dst_only) {
|
|
|
4f5da8 |
return false;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
-
|
|
|
4f5da8 |
- check_pitch = s->cirrus_blt_srcpitch;
|
|
|
4f5da8 |
- if (!zero_src_pitch_ok && !check_pitch) {
|
|
|
4f5da8 |
- check_pitch = s->cirrus_blt_width;
|
|
|
4f5da8 |
- }
|
|
|
4f5da8 |
-
|
|
|
4f5da8 |
- if (blit_region_is_unsafe(s, check_pitch,
|
|
|
4f5da8 |
+ if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch,
|
|
|
4f5da8 |
s->cirrus_blt_srcaddr)) {
|
|
|
4f5da8 |
return true;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
@@ -710,7 +700,7 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState *s, bool videosrc)
|
|
|
4f5da8 |
src = s->cirrus_bltbuf;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
|
|
|
4f5da8 |
- if (blit_is_unsafe(s, true, true)) {
|
|
|
4f5da8 |
+ if (blit_is_unsafe(s, true)) {
|
|
|
4f5da8 |
return 0;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
|
|
|
4f5da8 |
@@ -729,7 +719,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop)
|
|
|
4f5da8 |
{
|
|
|
4f5da8 |
cirrus_fill_t rop_func;
|
|
|
4f5da8 |
|
|
|
4f5da8 |
- if (blit_is_unsafe(s, true, true)) {
|
|
|
4f5da8 |
+ if (blit_is_unsafe(s, true)) {
|
|
|
4f5da8 |
return 0;
|
|
|
4f5da8 |
}
|
|
|
4f5da8 |
rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1];
|
|
|
4f5da8 |
@@ -829,7 +819,7 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
|
|
|
4f5da8 |
|
|
|
4f5da8 |
static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
|
|
|
4f5da8 |
{
|
|
|
4f5da8 |
- if (blit_is_unsafe(s, false, false))
|
|
|
4f5da8 |
+ if (blit_is_unsafe(s, false))
|
|
|
4f5da8 |
return 0;
|
|
|
4f5da8 |
|
|
|
4f5da8 |
return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,
|
|
|
4f5da8 |
--
|
|
|
4f5da8 |
1.8.3.1
|
|
|
4f5da8 |
|