diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2016-01-14 16:00:41 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-17 10:22:39 +0000 |
| commit | 8014c2513d5f595cfde7036ea4b4d98e2c223dd2 (patch) | |
| tree | 726bf09e97e78c1a7c482c4d133a36dfebc04916 | |
| parent | 88177077d437046f2edd5da429171acabefea6d7 (diff) | |
| download | linux-stable-8014c2513d5f595cfde7036ea4b4d98e2c223dd2.tar.gz linux-stable-8014c2513d5f595cfde7036ea4b4d98e2c223dd2.tar.bz2 linux-stable-8014c2513d5f595cfde7036ea4b4d98e2c223dd2.zip | |
virtio_pci: fix use after free on release
commit 2989be09a8a9d62a785137586ad941f916e08f83 upstream.
KASan detected a use-after-free error in virtio-pci remove code. In
virtio_pci_remove(), vp_dev is still used after being freed in
unregister_virtio_device() (in virtio_pci_release_dev() more
precisely).
To fix, keep a reference until cleanup is done.
Fixes: 63bd62a08ca4 ("virtio_pci: defer kfree until release callback")
Reported-by: Jerome Marchand <jmarchan@redhat.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Jerome Marchand <jmarchan@redhat.com>
[ luis: backported to 3.16:
- file rename: virtio_pci_legacy.c -> virtio_pci.c ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/virtio/virtio_pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index c09527df161c..3eecbbad6cb4 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -756,6 +756,7 @@ out: static void virtio_pci_remove(struct pci_dev *pci_dev) { struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev); + struct device *dev = get_device(&vp_dev->vdev.dev); unregister_virtio_device(&vp_dev->vdev); @@ -763,6 +764,7 @@ static void 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); + put_device(dev); } #ifdef CONFIG_PM_SLEEP |