Commit 260425ab authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/sstabellini/tags/cve-2015-5166-tag' into staging 



cve-2015-5166

# gpg: Signature made Mon 03 Aug 2015 15:27:44 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/cve-2015-5166-tag:
  Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e95edefb 6cd38783

hw/ide/piix.c

+7 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) 
    PCIIDEState *pci_ide;

    DriveInfo *di;

    int i;

    IDEDevice *idedev;



    pci_ide = PCI_IDE(dev);
@@ -181,6 +182,12 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) 
                blk_detach_dev(blk, ds);

            }

            pci_ide->bus[di->bus].ifs[di->unit].blk = NULL;

            if (!(i % 2)) {

                idedev = pci_ide->bus[di->bus].master;

            } else {

                idedev = pci_ide->bus[di->bus].slave;

            }

            idedev->conf.blk = NULL;

            blk_unref(blk);

        }

    }