Re: [PATCH kernel] vfio/spapr: Fix missing mutex unlock when creating a window

[Alex Williamson <alex.williamson@redhat.com>]

On Wed,  1 Feb 2017 14:26:16 +1100
Alexey Kardashevskiy <aik@ozlabs.ru> wrote:

> d9c728949ddc: "vfio/spapr: Postpone default window creation" added
> an additional exit to the VFIO_IOMMU_SPAPR_TCE_CREATE case and made it
> possible to return from tce_iommu_ioctl() without unlocking
> container->lock; this fixes the issue.
> 
> Fixes: d9c728949ddc
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>  drivers/vfio/vfio_iommu_spapr_tce.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)

Applies to for-linus branch for v4.10-rc7 w/ David's R-b.  Thanks,

Alex
 
> diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
> index 128d10282d16..7690e5bf3cf1 100644
> --- a/drivers/vfio/vfio_iommu_spapr_tce.c
> +++ b/drivers/vfio/vfio_iommu_spapr_tce.c
> @@ -1123,12 +1123,11 @@ static long tce_iommu_ioctl(void *iommu_data,
>  		mutex_lock(&container->lock);
>  
>  		ret = tce_iommu_create_default_window(container);
> -		if (ret)
> -			return ret;
> -
> -		ret = tce_iommu_create_window(container, create.page_shift,
> -				create.window_size, create.levels,
> -				&create.start_addr);
> +		if (!ret)
> +			ret = tce_iommu_create_window(container,
> +					create.page_shift,
> +					create.window_size, create.levels,
> +					&create.start_addr);
>  
>  		mutex_unlock(&container->lock);
>