| Message ID | 1523438149-16433-3-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Geert, On 11/04/18 11:15, Geert Uytterhoeven wrote: > If the IOMMU group setup fails, the reset module is not released. > > Fixes: b5add544d677d363 ("vfio, platform: make reset driver a requirement by default") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Reviewed-by: Eric Auger <eric.auger@redhat.com> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > v3: > - Add Reviewed-by, > > v2: > - Add Reviewed-by. > --- > drivers/vfio/platform/vfio_platform_common.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c > index 35469af87f88678e..b60bb5326668498c 100644 > --- a/drivers/vfio/platform/vfio_platform_common.c > +++ b/drivers/vfio/platform/vfio_platform_common.c > @@ -680,18 +680,23 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, > group = vfio_iommu_group_get(dev); > if (!group) { > pr_err("VFIO: No IOMMU group for device %s\n", vdev->name); > - return -EINVAL; > + ret = -EINVAL; > + goto put_reset; > } > > ret = vfio_add_group_dev(dev, &vfio_platform_ops, vdev); > - if (ret) { > - vfio_iommu_group_put(group, dev); > - return ret; > - } > + if (ret) > + goto put_iommu; > > mutex_init(&vdev->igate); > > return 0; > + > +put_iommu: > + vfio_iommu_group_put(group, dev); > +put_reset: > + vfio_platform_put_reset(vdev); > + return ret; > } > EXPORT_SYMBOL_GPL(vfio_platform_probe_common); > >
On Wed, 11 Apr 2018 11:15:48 +0200 Geert Uytterhoeven <geert+renesas@glider.be> wrote: > If the IOMMU group setup fails, the reset module is not released. > > Fixes: b5add544d677d363 ("vfio, platform: make reset driver a requirement by default") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Reviewed-by: Eric Auger <eric.auger@redhat.com> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > v3: > - Add Reviewed-by, > > v2: > - Add Reviewed-by. > --- > drivers/vfio/platform/vfio_platform_common.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) Applied to next branch for v4.18 with Eric's ack. Thanks, Alex
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 35469af87f88678e..b60bb5326668498c 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -680,18 +680,23 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, group = vfio_iommu_group_get(dev); if (!group) { pr_err("VFIO: No IOMMU group for device %s\n", vdev->name); - return -EINVAL; + ret = -EINVAL; + goto put_reset; } ret = vfio_add_group_dev(dev, &vfio_platform_ops, vdev); - if (ret) { - vfio_iommu_group_put(group, dev); - return ret; - } + if (ret) + goto put_iommu; mutex_init(&vdev->igate); return 0; + +put_iommu: + vfio_iommu_group_put(group, dev); +put_reset: + vfio_platform_put_reset(vdev); + return ret; } EXPORT_SYMBOL_GPL(vfio_platform_probe_common);
If the IOMMU group setup fails, the reset module is not released. Fixes: b5add544d677d363 ("vfio, platform: make reset driver a requirement by default") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> --- v3: - Add Reviewed-by, v2: - Add Reviewed-by. --- drivers/vfio/platform/vfio_platform_common.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)