From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wihvs-000591-Uw for qemu-devel@nongnu.org; Fri, 09 May 2014 06:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wihvo-0003il-3O for qemu-devel@nongnu.org; Fri, 09 May 2014 06:21:36 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:11605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wihvn-0003iK-BO for qemu-devel@nongnu.org; Fri, 09 May 2014 06:21:32 -0400 From: Date: Fri, 9 May 2014 18:21:09 +0800 Message-ID: <1399630869-920-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] 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: weidong.huang@huawei.com, mst@redhat.com, Gonglei , kraxel@redhat.com, pbonzini@redhat.com, afaerber@suse.de 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 --- For isa cirrus vga device, its' init function has been droped at commit db895a1e6a97e919f9b86d60c969377357b05066. I have no idea how adding check on isa_cirrus_vga device. Any ideas? Thanks. hw/display/cirrus_vga.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index d1afc76..5fec068 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2959,6 +2959,13 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev); int16_t device_id = pc->device_id; + /* 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 != 4 || s->vga.vram_size_mb != 8 || + s->vga.vram_size_mb != 16) { + error_report("Invalid cirrus_vga ram size '%u'\n", 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), -- 1.7.12.4