Fix overflow in i440fx_init()
PATCH 1/1 Fix overflow in i440fx_init()
The ram_size parameter can be larger than an int, so it may be truncated.
Fix by using the correct type.
Signed-off-by Avi Kivity <[email protected]>
--- hw/pc.h | 2 +- hw/piix_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
hw/pc.h +1 -1
@@ -115,7 +115,7 @@ int pcspk_audio_init(qemu_irq *pic);struct PCII440FXState ;typedef struct PCII440FXState PCII440FXState ; -PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix_devfn,qemu_irq *pic,int ram_size); +PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix_devfn,qemu_irq *pic,ram_addr_t ram_size);void i440fx_set_smm (PCII440FXState *d,int val);void i440fx_init_memory_mappings (PCII440FXState *d);
hw/piix_pci.c +1 -1
@@ -220,7 +220,7 @@ static int i440fx_initfn(PCIDevice *dev)static PIIX3State *piix3_dev; -PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix3_devfn,qemu_irq *pic,int ram_size) +PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix3_devfn,qemu_irq *pic,ram_addr_t ram_size) {DeviceState *dev;PCIBus *b;
Signature · 1 line
1.7.0.4
Aurelien Jarno
AppliedQuoted 3 lines · Avi Kivity
The
ram_sizeparameter can be larger than an int, so it may be truncated.Fix by using the correct type.
Thanks, applied.
Quoted 38 lines
Signed-off-by Avi Kivity <[email protected]>--- hw/pc.h | 2 +- hw/piix_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)hw/pc.h +1
-1@@ -115,7 +115,7 @@ int pcspk_audio_init(qemu_irq *pic);struct PCII440FXState ;typedef struct PCII440FXState PCII440FXState ; -PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix_devfn,qemu_irq *pic,int ram_size); +PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix_devfn,qemu_irq *pic,ram_addr_t ram_size);void i440fx_set_smm (PCII440FXState *d,int val);void i440fx_init_memory_mappings (PCII440FXState *d);hw/piix_pci.c +1
-1@@ -220,7 +220,7 @@ static int i440fx_initfn(PCIDevice *dev)static PIIX3State *piix3_dev; -PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix3_devfn,qemu_irq *pic,int ram_size) +PCIBus *i440fx_init (PCII440FXState **pi440fx_state,int *piix3_devfn,qemu_irq *pic,ram_addr_t ram_size) {DeviceState *dev;PCIBus *b;Signature · 1 line
1.7.0.4
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net