Commit 33635bd9 authored by weiping zhang's avatar weiping zhang Committed by Michael S. Tsirkin

virtio_pci: don't kfree device on register failure

As mentioned at drivers/base/core.c:
/*
 * NOTE: _Never_ directly free @dev after calling this function, even
 * if it returned an error! Always use put_device() to give up the
 * reference initialized in this function instead.
 */
so we don't free vp_dev until vp_dev->vdev.dev.release be called.
Signed-off-by: default avatarweiping zhang <zhangweiping@didichuxing.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f2b44cde
...@@ -513,7 +513,7 @@ static void virtio_pci_release_dev(struct device *_d) ...@@ -513,7 +513,7 @@ static void virtio_pci_release_dev(struct device *_d)
static int virtio_pci_probe(struct pci_dev *pci_dev, static int virtio_pci_probe(struct pci_dev *pci_dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct virtio_pci_device *vp_dev; struct virtio_pci_device *vp_dev, *reg_dev = NULL;
int rc; int rc;
/* allocate our structure and fill it out */ /* allocate our structure and fill it out */
...@@ -551,6 +551,7 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, ...@@ -551,6 +551,7 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
pci_set_master(pci_dev); pci_set_master(pci_dev);
rc = register_virtio_device(&vp_dev->vdev); rc = register_virtio_device(&vp_dev->vdev);
reg_dev = vp_dev;
if (rc) if (rc)
goto err_register; goto err_register;
...@@ -564,7 +565,10 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, ...@@ -564,7 +565,10 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
err_probe: err_probe:
pci_disable_device(pci_dev); pci_disable_device(pci_dev);
err_enable_device: err_enable_device:
kfree(vp_dev); if (reg_dev)
put_device(&vp_dev->vdev.dev);
else
kfree(vp_dev);
return rc; return rc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment