|
 |
9ae3a8 |
From 92ff5f7388ad0e0826c8ca6fc362b0f84a37f26c Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 12 Nov 2014 13:05:33 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 31/41] vga: fix invalid read after free
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1415797533-28127-2-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 62323
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] vga: fix invalid read after free
|
|
|
9ae3a8 |
Bugzilla: 1161890
|
|
|
9ae3a8 |
RH-Acked-by: dgibson <dgibson@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Marc-André Lureau <marcandre.lureau@gmail.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
After calling dpy_gfx_replace_surface(s->con, surface), the outer
|
|
|
9ae3a8 |
surface is invalid.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
==5370== Invalid read of size 4
|
|
|
9ae3a8 |
==5370== at 0x460229: surface_bits_per_pixel (console.h:250)
|
|
|
9ae3a8 |
==5370== by 0x466A81: get_depth_index (vga.c:1173)
|
|
|
9ae3a8 |
==5370== by 0x467EC2: vga_draw_graphic (vga.c:1718)
|
|
|
9ae3a8 |
==5370== by 0x4687A5: vga_update_display (vga.c:1914)
|
|
|
9ae3a8 |
==5370== by 0x2A782E: qxl_hw_update (qxl.c:1766)
|
|
|
9ae3a8 |
==5370== by 0x3EB83B: graphic_hw_update (console.c:254)
|
|
|
9ae3a8 |
==5370== by 0x3FBE31: qemu_spice_display_refresh (spice-display.c:418)
|
|
|
9ae3a8 |
==5370== by 0x2A7D01: display_refresh (qxl.c:1886)
|
|
|
9ae3a8 |
==5370== by 0x3EEE1C: dpy_refresh (console.c:1436)
|
|
|
9ae3a8 |
==5370== by 0x3EB543: gui_update (console.c:192)
|
|
|
9ae3a8 |
==5370== by 0x3C43B3: timerlist_run_timers (qemu-timer.c:488)
|
|
|
9ae3a8 |
==5370== by 0x3C4416: qemu_clock_run_timers (qemu-timer.c:499)
|
|
|
9ae3a8 |
==5370== Address 0x22ffb1e0 is 0 bytes inside a block of size 56 free'd
|
|
|
9ae3a8 |
==5370== at 0x4A074C4: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
|
|
|
9ae3a8 |
==5370== by 0x4245FC: free_and_trace (vl.c:2771)
|
|
|
9ae3a8 |
==5370== by 0x50899AE: g_free (gmem.c:252)
|
|
|
9ae3a8 |
==5370== by 0x3EE8D3: qemu_free_displaysurface (console.c:1332)
|
|
|
9ae3a8 |
==5370== by 0x3EEDB7: dpy_gfx_replace_surface (console.c:1427)
|
|
|
9ae3a8 |
==5370== by 0x467EB6: vga_draw_graphic (vga.c:1714)
|
|
|
9ae3a8 |
==5370== by 0x4687A5: vga_update_display (vga.c:1914)
|
|
|
9ae3a8 |
==5370== by 0x2A782E: qxl_hw_update (qxl.c:1766)
|
|
|
9ae3a8 |
==5370== by 0x3EB83B: graphic_hw_update (console.c:254)
|
|
|
9ae3a8 |
==5370== by 0x3FBE31: qemu_spice_display_refresh (spice-display.c:418)
|
|
|
9ae3a8 |
==5370== by 0x2A7D01: display_refresh (qxl.c:1886)
|
|
|
9ae3a8 |
==5370== by 0x3EEE1C: dpy_refresh (console.c:1436)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
|
|
|
9ae3a8 |
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Message-id: 1383664554-15248-1-git-send-email-marcandre.lureau@gmail.com
|
|
|
9ae3a8 |
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2c8ebac7ccf51a8e683de593c4240d2ed7d592ec)
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/display/vga.c | 1 -
|
|
|
9ae3a8 |
1 file changed, 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
9ae3a8 |
index de5d63d..0761b9e 100644
|
|
|
9ae3a8 |
--- a/hw/display/vga.c
|
|
|
9ae3a8 |
+++ b/hw/display/vga.c
|
|
|
9ae3a8 |
@@ -1746,7 +1746,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
9ae3a8 |
} else if (is_buffer_shared(surface) &&
|
|
|
9ae3a8 |
(full_update || surface_data(surface) != s->vram_ptr
|
|
|
9ae3a8 |
+ (s->start_addr * 4))) {
|
|
|
9ae3a8 |
- DisplaySurface *surface;
|
|
|
9ae3a8 |
surface = qemu_create_displaysurface_from(disp_width,
|
|
|
9ae3a8 |
height, depth, s->line_offset,
|
|
|
9ae3a8 |
s->vram_ptr + (s->start_addr * 4), byteswap);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|