|
 |
a59b75 |
From a4a396ff1f6bf512d8a1e65f692242d4332c615c Mon Sep 17 00:00:00 2001
|
|
|
a59b75 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
a59b75 |
Date: Mon, 19 Mar 2018 14:34:59 +0100
|
|
|
a59b75 |
Subject: [PATCH 4/4] vga: fix region calculation
|
|
|
a59b75 |
|
|
|
a59b75 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
a59b75 |
Message-id: <20180319143459.15364-3-kraxel@redhat.com>
|
|
|
a59b75 |
Patchwork-id: 79360
|
|
|
a59b75 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 2/2] vga: fix region calculation
|
|
|
a59b75 |
Bugzilla: 1566878
|
|
|
a59b75 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
a59b75 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
a59b75 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
a59b75 |
|
|
|
a59b75 |
Typically the scanline length and the line offset are identical. But
|
|
|
a59b75 |
in case they are not our calculation for region_end is incorrect. Using
|
|
|
a59b75 |
line_offset is fine for all scanlines, except the last one where we have
|
|
|
a59b75 |
to use the actual scanline length.
|
|
|
a59b75 |
|
|
|
a59b75 |
Fixes: CVE-2018-7550
|
|
|
a59b75 |
Reported-by: Ross Lagerwall <ross.lagerwall@citrix.com>
|
|
|
a59b75 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
a59b75 |
Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
a59b75 |
Tested-by: Ross Lagerwall <ross.lagerwall@citrix.com>
|
|
|
a59b75 |
Message-id: 20180309143704.13420-1-kraxel@redhat.com
|
|
|
a59b75 |
(cherry picked from commit 7cdc61becd095b64a786b2625f321624e7111f3d)
|
|
|
a59b75 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a59b75 |
---
|
|
|
a59b75 |
hw/display/vga.c | 2 ++
|
|
|
a59b75 |
1 file changed, 2 insertions(+)
|
|
|
a59b75 |
|
|
|
a59b75 |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
a59b75 |
index b6a3b95..f060f26 100644
|
|
|
a59b75 |
--- a/hw/display/vga.c
|
|
|
a59b75 |
+++ b/hw/display/vga.c
|
|
|
a59b75 |
@@ -1489,6 +1489,8 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
a59b75 |
|
|
|
a59b75 |
region_start = (s->start_addr * 4);
|
|
|
a59b75 |
region_end = region_start + (ram_addr_t)s->line_offset * height;
|
|
|
a59b75 |
+ region_end += width * s->get_bpp(s) / 8; /* scanline length */
|
|
|
a59b75 |
+ region_end -= s->line_offset;
|
|
|
a59b75 |
if (region_end > s->vbe_size) {
|
|
|
a59b75 |
/* wraps around (can happen with cirrus vbe modes) */
|
|
|
a59b75 |
region_start = 0;
|
|
|
a59b75 |
--
|
|
|
a59b75 |
1.8.3.1
|
|
|
a59b75 |
|