From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YIF-0003F3-4N for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:43:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5YIA-00038s-6E for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:43:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YI9-00038e-U0 for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:43:02 -0400 From: Gerd Hoffmann Date: Fri, 11 Jul 2014 12:24:36 +0200 Message-Id: <1405074278-16230-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1405074278-16230-1-git-send-email-kraxel@redhat.com> References: <1405074278-16230-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/3] cirrus_vga: adding sanity check for vram size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei when configure a invalid vram size for cirrus card, such as less 2 MB, which will crash qemu. Follow the real hardware, the cirrus card has 4 MB video memory. Also for backward compatibility, accept 8 MB and 16 MB vram size. Signed-off-by: Gonglei Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Gerd Hoffmann --- hw/display/cirrus_vga.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 6fbe39d..52d039e 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2911,6 +2911,14 @@ static void isa_cirrus_vga_realizefn(DeviceState *= dev, Error **errp) ISACirrusVGAState *d =3D ISA_CIRRUS_VGA(dev); VGACommonState *s =3D &d->cirrus_vga.vga; =20 + /* follow real hardware, cirrus card emulated has 4 MB video memory. + Also accept 8 MB/16 MB for backward compatibility. */ + if (s->vram_size_mb !=3D 4 && s->vram_size_mb !=3D 8 && + s->vram_size_mb !=3D 16) { + error_setg(errp, "Invalid cirrus_vga ram size '%u'", + s->vram_size_mb); + return; + } vga_common_init(s, OBJECT(dev), true); cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430, = 0, isa_address_space(isadev), @@ -2957,6 +2965,14 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) PCIDeviceClass *pc =3D PCI_DEVICE_GET_CLASS(dev); int16_t device_id =3D pc->device_id; =20 + /* follow real hardware, cirrus card emulated has 4 MB video memory. + Also accept 8 MB/16 MB for backward compatibility. */ + if (s->vga.vram_size_mb !=3D 4 && s->vga.vram_size_mb !=3D 8 && + s->vga.vram_size_mb !=3D 16) { + error_report("Invalid cirrus_vga ram size '%u'", + s->vga.vram_size_mb); + return -1; + } /* setup VGA */ vga_common_init(&s->vga, OBJECT(dev), true); cirrus_init_common(s, OBJECT(dev), device_id, 1, pci_address_space(= dev), --=20 1.8.3.1