evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://github.com/rustyrussell/linux

Browse source 
* git://github.com/rustyrussell/linux:
  virtio-pci: fix use after free
This commit is contained in:
Linus Torvalds 2011-11-14 04:00:01 -02:00
commit d291ffb3cf
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/virtio/virtio_pci.c
View file

@ -594,11 +594,11 @@ static struct virtio_config_ops virtio_pci_config_ops = {
static void virtio_pci_release_dev(struct device *_d) static void virtio_pci_release_dev(struct device *_d)
{ {
struct virtio_device *dev = container_of(_d, struct virtio_device, /*
dev); * No need for a release method as we allocate/free
struct virtio_pci_device *vp_dev = to_vp_device(dev); * all devices together with the pci devices.
* Provide an empty one to avoid getting a warning from core.
kfree(vp_dev); */
} }
/* the PCI probing function */ /* 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_iounmap(pci_dev, vp_dev->ioaddr);
pci_release_regions(pci_dev); pci_release_regions(pci_dev);
pci_disable_device(pci_dev); pci_disable_device(pci_dev);
kfree(vp_dev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM