On Wed, 20 Dec 2017 12:26:43 +0800 weiping zhang <[email protected]> wrote:
> 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: weiping zhang <[email protected]> > --- > drivers/virtio/virtio_pci_common.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/virtio/virtio_pci_common.c > b/drivers/virtio/virtio_pci_common.c > index 1c4797e..48d4d1c 100644 > --- a/drivers/virtio/virtio_pci_common.c > +++ b/drivers/virtio/virtio_pci_common.c > @@ -513,7 +513,7 @@ static void virtio_pci_release_dev(struct device *_d) > static int virtio_pci_probe(struct pci_dev *pci_dev, > const struct pci_device_id *id) > { > - struct virtio_pci_device *vp_dev; > + struct virtio_pci_device *vp_dev, *reg_dev = NULL; Not sure if I would have used a pointer for this purpose, but as that is what Michael had proposed... > int rc; > > /* allocate our structure and fill it out */ > @@ -551,6 +551,7 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, > pci_set_master(pci_dev); > > rc = register_virtio_device(&vp_dev->vdev); > + reg_dev = vp_dev; > if (rc) > goto err_register; > > @@ -564,7 +565,10 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, > err_probe: > pci_disable_device(pci_dev); > err_enable_device: > - kfree(vp_dev); > + if (reg_dev) > + put_device(&vp_dev->vdev.dev); > + else > + kfree(vp_dev); > return rc; > } > Reviewed-by: Cornelia Huck <[email protected]> _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
