summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBALATON Zoltan2020-06-21 13:12:38 +0200
committerGerd Hoffmann2020-06-30 22:54:24 +0200
commit41977c65c04a85f177603778cb60e06847efd3af (patch)
treee8b499dc6b3c3bd8f9b34232615c9c8daacf657f
parentati-vga: Support unaligned access to hardware cursor registers (diff)
downloadqemu-41977c65c04a85f177603778cb60e06847efd3af.tar.gz
qemu-41977c65c04a85f177603778cb60e06847efd3af.tar.xz
qemu-41977c65c04a85f177603778cb60e06847efd3af.zip
ati-vga: Do not assert on error
Do not abort on unsupported value just print log and continue. While display will likely be broken this prevents malicious guest to crash QEMU causing denial of service. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Message-id: 0c13dab5d8e3b7e7479c3edbf53aeac8c09de6de.1592737958.git.balaton@eik.bme.hu Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/display/ati.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/ati.c b/hw/display/ati.c
index 245130d52f..95fc443cac 100644
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -86,8 +86,8 @@ static void ati_vga_switch_mode(ATIVGAState *s)
break;
default:
qemu_log_mask(LOG_UNIMP, "Unsupported bpp value\n");
+ return;
}
- assert(bpp != 0);
DPRINTF("Switching to %dx%d %d %d @ %x\n", h, v, stride, bpp, offs);
vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_ENABLE);
vbe_ioport_write_data(&s->vga, 0, VBE_DISPI_DISABLED);