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

Commit 28a68387 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Alex Williamson
Browse files

vfio: platform: Fix reset module leak in error path 



If the IOMMU group setup fails, the reset module is not released.

Fixes: b5add544 ("vfio, platform: make reset driver a requirement by default")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Acked-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent a5e6e650

drivers/vfio/platform/vfio_platform_common.c

+10 −5
Original line number Diff line number Diff line
@@ -681,18 +681,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);