Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2989be09 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio_pci: fix use after free on release 



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: 63bd62a0 ("virtio_pci: defer kfree until release callback")
Reported-by: default avatarJerome Marchand <jmarchan@redhat.com>
Cc: stable@vger.kernel.org
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarJerome Marchand <jmarchan@redhat.com>
parent 92e963f5

drivers/virtio/virtio_pci_common.c

+2 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, 
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);
@@ -554,6 +555,7 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) 
		virtio_pci_modern_remove(vp_dev);



	pci_disable_device(pci_dev);

	put_device(dev);

}



static struct pci_driver virtio_pci_driver = {