|
 |
4a2fec |
From 5a5e2e2d4f7cc2fd67fa970584f06a29ba69fc3a Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
Date: Thu, 5 Oct 2017 09:49:33 +0200
|
|
|
4a2fec |
Subject: [PATCH 02/69] vga: fix display update region calculation (split
|
|
|
4a2fec |
screen)
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
Message-id: <20171005094933.19435-2-kraxel@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 76816
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 1/1] vga: fix display update region calculation (split screen)
|
|
|
4a2fec |
Bugzilla: 1486648
|
|
|
4a2fec |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
vga display update mis-calculated the region for the dirty bitmap
|
|
|
4a2fec |
snapshot in case split screen mode is used. This can trigger an
|
|
|
4a2fec |
assert in cpu_physical_memory_snapshot_get_dirty().
|
|
|
4a2fec |
|
|
|
4a2fec |
Impact: DoS for privileged guest users.
|
|
|
4a2fec |
|
|
|
4a2fec |
Fixes: CVE-2017-13673
|
|
|
4a2fec |
Fixes: fec5e8c92becad223df9d972770522f64aafdb72
|
|
|
4a2fec |
Cc: P J P <ppandit@redhat.com>
|
|
|
4a2fec |
Reported-by: David Buchanan <d@vidbuchanan.co.uk>
|
|
|
4a2fec |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
Message-id: 20170828123307.15392-1-kraxel@redhat.com
|
|
|
4a2fec |
(cherry picked from commit e65294157d4b69393b3f819c99f4f647452b48e3)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/display/vga.c | 10 ++++++++--
|
|
|
4a2fec |
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
4a2fec |
index 4c2ee0b..497c823 100644
|
|
|
4a2fec |
--- a/hw/display/vga.c
|
|
|
4a2fec |
+++ b/hw/display/vga.c
|
|
|
4a2fec |
@@ -1628,9 +1628,15 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
4a2fec |
y1 = 0;
|
|
|
4a2fec |
|
|
|
4a2fec |
if (!full_update) {
|
|
|
4a2fec |
+ ram_addr_t region_start = addr1;
|
|
|
4a2fec |
+ ram_addr_t region_end = addr1 + line_offset * height;
|
|
|
4a2fec |
vga_sync_dirty_bitmap(s);
|
|
|
4a2fec |
- snap = memory_region_snapshot_and_clear_dirty(&s->vram, addr1,
|
|
|
4a2fec |
- line_offset * height,
|
|
|
4a2fec |
+ if (s->line_compare < height) {
|
|
|
4a2fec |
+ /* split screen mode */
|
|
|
4a2fec |
+ region_start = 0;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ snap = memory_region_snapshot_and_clear_dirty(&s->vram, region_start,
|
|
|
4a2fec |
+ region_end - region_start,
|
|
|
4a2fec |
DIRTY_MEMORY_VGA);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|