From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpZhb-0000wb-Ab for qemu-devel@nongnu.org; Thu, 20 Jun 2013 03:54:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpZhY-00068i-Iy for qemu-devel@nongnu.org; Thu, 20 Jun 2013 03:54:43 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:39041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpZhY-00068K-CF for qemu-devel@nongnu.org; Thu, 20 Jun 2013 03:54:40 -0400 From: Markus Armbruster Date: Thu, 20 Jun 2013 09:54:36 +0200 Message-Id: <1371714876-2317-9-git-send-email-armbru@redhat.com> In-Reply-To: <1371714876-2317-1-git-send-email-armbru@redhat.com> References: <1371714876-2317-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 8/8] pc_sysfw: Fix ISA BIOS init for ridiculously big flash List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, stefano.stabellini@eu.citrix.com, mtosatti@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net pc_isa_bios_init() suffers integer overflow for flash larger than INT_MAX. Signed-off-by: Markus Armbruster --- hw/block/pc_sysfw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c index 412d1b0..aebefc9 100644 --- a/hw/block/pc_sysfw.c +++ b/hw/block/pc_sysfw.c @@ -54,10 +54,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, flash_size = memory_region_size(flash_mem); /* map the last 128KB of the BIOS in ISA space */ - isa_bios_size = flash_size; - if (isa_bios_size > (128 * 1024)) { - isa_bios_size = 128 * 1024; - } + isa_bios_size = MIN(flash_size, 128 * 1024); isa_bios = g_malloc(sizeof(*isa_bios)); memory_region_init_ram(isa_bios, "isa-bios", isa_bios_size); vmstate_register_ram_global(isa_bios); -- 1.7.11.7