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

Commit e9944232 authored by Sinan Kaya's avatar Sinan Kaya Committed by Alex Williamson
Browse files

vfio: platform: check reset call return code during open 



Open call is ignoring the return code from reset call and can
potentially continue even though reset call failed.

If reset_required module parameter is set, this patch is going
to validate the return code and will abort open if reset fails.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Reviewed-by: default avatarBaptiste Reynal <b.reynal@virtualopensystems.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent b5add544

drivers/vfio/platform/vfio_platform_common.c

+10 −1
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ static int vfio_platform_open(void *device_data) 
	mutex_lock(&driver_lock);



	if (!vdev->refcnt) {

		const char *extra_dbg = NULL;



		ret = vfio_platform_regions_init(vdev);

		if (ret)

			goto err_reg;
@@ -259,7 +261,12 @@ static int vfio_platform_open(void *device_data) 
		if (ret)

			goto err_irq;



		vfio_platform_call_reset(vdev, NULL);

		ret = vfio_platform_call_reset(vdev, &extra_dbg);

		if (ret && vdev->reset_required) {

			dev_warn(vdev->device, "reset driver is required and reset call failed in open (%d) %s\n",

				 ret, extra_dbg ? extra_dbg : "");

			goto err_rst;

		}

	}



	vdev->refcnt++;
@@ -267,6 +274,8 @@ static int vfio_platform_open(void *device_data) 
	mutex_unlock(&driver_lock);

	return 0;



err_rst:

	vfio_platform_irq_cleanup(vdev);

err_irq:

	vfio_platform_regions_cleanup(vdev);

err_reg: