[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 8/8] pc_sysfw: Fix ISA BIOS init for ridiculousl
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 8/8] pc_sysfw: Fix ISA BIOS init for ridiculously big flash |
Date: |
Thu, 13 Jun 2013 09:02:19 +0200 |
pc_isa_bios_init() suffers integer overflow for flash larger than
INT_MAX.
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH RFC 2/8] exec: Clean up fall back when -mem-path allocation fails, (continued)
- [Qemu-devel] [PATCH RFC 2/8] exec: Clean up fall back when -mem-path allocation fails, Markus Armbruster, 2013/06/13
- [Qemu-devel] [PATCH RFC 3/8] exec: Reduce ifdeffery around -mem-path, Markus Armbruster, 2013/06/13
- [Qemu-devel] [PATCH RFC 6/8] exec: Clean up unnecessary S390 ifdeffery, Markus Armbruster, 2013/06/13
- [Qemu-devel] [PATCH RFC 1/8] exec: Fix Xen RAM allocation with unusual options, Markus Armbruster, 2013/06/13
- [Qemu-devel] [PATCH RFC 4/8] s390: Simplify the RAM allocation hook, Markus Armbruster, 2013/06/13
- [Qemu-devel] [PATCH RFC 8/8] pc_sysfw: Fix ISA BIOS init for ridiculously big flash,
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 7/8] exec: Don't abort when we can't allocate guest memory, Markus Armbruster, 2013/06/13
- [Qemu-devel] [PATCH RFC 5/8] s390: Make qemu_ram_remap() consistent with allocation, Markus Armbruster, 2013/06/13
- Re: [Qemu-devel] [PATCH RFC 0/8] Guest memory allocation fixes & cleanup, Markus Armbruster, 2013/06/13