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 <redacted>
---
drivers/vfio/vfio_iommu_spapr_tce.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
From: David Gibson <hidden> Date: 2017-02-01 03:50:29
On Wed, Feb 01, 2017 at 02:26:16PM +1100, Alexey Kardashevskiy 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 <redacted>
@@ -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)-returnret;--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);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
From: Alex Williamson <hidden> Date: 2017-02-01 17:06:46
On Wed, 1 Feb 2017 14:26:16 +1100
Alexey Kardashevskiy [off-list ref] 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 <redacted>
---
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