From 69c8944f17cb6c084567a16c080cfa7bc780e668 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Sun, 15 May 2011 19:27:34 +0300 Subject: ich/ahci: fix uninitialized memory use The commit 667bb59d2358daeef179583c944becba3f1f9680 uses d->ahci.mem before it is initialized by ahci_init(). Fix this by calling ahci_init() first thing so that it's safe to use all fields in the ahci state struct. Reported-by: Alexey Zaytsev Reported-by: Jan Kiszka Tested-by: Alexey Zaytsev Signed-off-by: Michael S. Tsirkin --- hw/ide/ich.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/ide/ich.c') diff --git a/hw/ide/ich.c b/hw/ide/ich.c index e44339b078..5ce0a88800 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -77,6 +77,8 @@ static int pci_ich9_ahci_init(PCIDevice *dev) struct AHCIPCIState *d; d = DO_UPCAST(struct AHCIPCIState, card, dev); + ahci_init(&d->ahci, &dev->qdev, 6); + pci_config_set_vendor_id(d->card.config, PCI_VENDOR_ID_INTEL); pci_config_set_device_id(d->card.config, PCI_DEVICE_ID_INTEL_82801IR); @@ -97,8 +99,6 @@ static int pci_ich9_ahci_init(PCIDevice *dev) pci_register_bar_simple(&d->card, 5, 0x1000, 0, d->ahci.mem); msi_init(dev, 0x50, 1, true, false); - - ahci_init(&d->ahci, &dev->qdev, 6); d->ahci.irq = d->card.irq[0]; return 0; -- cgit v1.2.1