aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-14 04:00:01 -0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-14 04:00:01 -0200
commitd291ffb3cf4f8f74b73bac77478c619251ee8a9f (patch)
tree65ac6eb9dd4113ab7ede46f873ed0b30faca8792
parent52e4c2a05256cb83cda12f3c2137ab1533344edb (diff)
parent72103bd1285211440621f2c46f4fce377584de54 (diff)
downloadlinux-linaro-stable-d291ffb3cf4f8f74b73bac77478c619251ee8a9f.tar.gz
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux: virtio-pci: fix use after free
-rw-r--r--drivers/virtio/virtio_pci.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 79a31e5b4b68..3d1bf41e8892 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -594,11 +594,11 @@ static struct virtio_config_ops virtio_pci_config_ops = {
static void virtio_pci_release_dev(struct device *_d)
{
- struct virtio_device *dev = container_of(_d, struct virtio_device,
- dev);
- struct virtio_pci_device *vp_dev = to_vp_device(dev);
-
- kfree(vp_dev);
+ /*
+ * No need for a release method as we allocate/free
+ * all devices together with the pci devices.
+ * Provide an empty one to avoid getting a warning from core.
+ */
}
/* the PCI probing function */
@@ -686,6 +686,7 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
pci_iounmap(pci_dev, vp_dev->ioaddr);
pci_release_regions(pci_dev);
pci_disable_device(pci_dev);
+ kfree(vp_dev);
}
#ifdef CONFIG_PM