Jason Wang
2021-Nov-08 05:55 UTC
[PATCH 1/2] eni_vdpa: Fix an error handling path in 'eni_vdpa_probe()'
On Mon, Nov 8, 2021 at 12:15 AM Christophe JAILLET <christophe.jaillet at wanadoo.fr> wrote:> > In the error handling path, a successful 'vp_legacy_probe()' should be > balanced by a corresponding 'vp_legacy_remove()' call, as already done in > the remove function. > > Add the missing call and update gotos accordingly. > > Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI") > Signed-off-by: Christophe JAILLET <christophe.jaillet at wanadoo.fr> > --- > drivers/vdpa/alibaba/eni_vdpa.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c > index 3f788794571a..12b3db6b4517 100644 > --- a/drivers/vdpa/alibaba/eni_vdpa.c > +++ b/drivers/vdpa/alibaba/eni_vdpa.c > @@ -501,7 +501,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) > if (!eni_vdpa->vring) { > ret = -ENOMEM; > ENI_ERR(pdev, "failed to allocate virtqueues\n"); > - goto err; > + goto err_remove_vp_legacy; > } > > for (i = 0; i < eni_vdpa->queues; i++) { > @@ -513,11 +513,13 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) > ret = vdpa_register_device(&eni_vdpa->vdpa, eni_vdpa->queues); > if (ret) { > ENI_ERR(pdev, "failed to register to vdpa bus\n"); > - goto err; > + goto err_remove_vp_legacy; > } > > return 0; > > +err_remove_vp_legacy: > + vp_legacy_remove(&eni_vdpa->ldev);Won't vp_legacy_remove() be triggered by the put_devic() below? Thanks> err: > put_device(&eni_vdpa->vdpa.dev); > return ret; > -- > 2.30.2 >