From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 11/13] ati-vga: Do not assert on error
Date: Wed, 1 Jul 2020 17:04:23 +0200 [thread overview]
Message-ID: <20200701150425.13739-12-kraxel@redhat.com> (raw)
In-Reply-To: <20200701150425.13739-1-kraxel@redhat.com>
From: BALATON Zoltan <balaton@eik.bme.hu>
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>
---
hw/display/ati.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/display/ati.c b/hw/display/ati.c
index 245130d52f33..95fc443cac83 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);
--
2.18.4
next prev parent reply other threads:[~2020-07-01 15:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 15:04 [PULL 00/13] Vga 20200701 patches Gerd Hoffmann
2020-07-01 15:04 ` [PULL 01/13] sm501: Fix bounds checks Gerd Hoffmann
2020-07-01 15:04 ` [PULL 02/13] sm501: Drop unneded variable Gerd Hoffmann
2020-07-01 15:04 ` [PULL 03/13] sm501: Ignore no-op blits Gerd Hoffmann
2020-07-01 15:04 ` [PULL 04/13] sm501: Introduce variable for commonly used value for better readability Gerd Hoffmann
2020-07-01 15:04 ` [PULL 05/13] sm501: Optimise 1 pixel 2d ops Gerd Hoffmann
2020-07-01 15:04 ` [PULL 06/13] sm501: Use stn_he_p/ldn_he_p instead of switch/case Gerd Hoffmann
2020-07-01 15:04 ` [PULL 07/13] sm501: Do not allow guest to set invalid format Gerd Hoffmann
2020-07-01 15:04 ` [PULL 08/13] sm501: Convert debug printfs to traces Gerd Hoffmann
2020-07-01 15:04 ` [PULL 09/13] sm501: Fix and optimize overlap check Gerd Hoffmann
2020-07-01 15:04 ` [PULL 10/13] ati-vga: Support unaligned access to hardware cursor registers Gerd Hoffmann
2020-07-01 15:04 ` Gerd Hoffmann [this message]
2020-07-01 15:04 ` [PULL 12/13] ati-vga: Add dummy MEM_SDRAM_MODE_REG Gerd Hoffmann
2020-07-01 15:04 ` [PULL 13/13] configure: vgabios cleanups Gerd Hoffmann
2020-07-02 14:53 ` [PULL 00/13] Vga 20200701 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200701150425.13739-12-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).