diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 18:38:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 18:38:53 -0500 |
| commit | e9f7f17d53003ee46ccbaf057f7820bfb6e76b9d (patch) | |
| tree | 146416492df5659e125695158c47b697fd969775 | |
| parent | 7a92cc6bcbc90bf72e57eff2dc29900a636c2d0d (diff) | |
| parent | 2da64d20a0b20046d688e44f4033efd09157e29d (diff) | |
Merge tag 'vfio-v4.10-rc7' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson:
"Fix an error path in SPAPR IOMMU backend (Alexey Kardashevskiy)"
* tag 'vfio-v4.10-rc7' of git://github.com/awilliam/linux-vfio:
vfio/spapr: Fix missing mutex unlock when creating a window
| -rw-r--r-- | drivers/vfio/vfio_iommu_spapr_tce.c | 11 |
1 files changed, 5 insertions, 6 deletions
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, | |||
| 1123 | mutex_lock(&container->lock); | 1123 | mutex_lock(&container->lock); |
| 1124 | 1124 | ||
| 1125 | ret = tce_iommu_create_default_window(container); | 1125 | ret = tce_iommu_create_default_window(container); |
| 1126 | if (ret) | 1126 | if (!ret) |
| 1127 | return ret; | 1127 | ret = tce_iommu_create_window(container, |
| 1128 | 1128 | create.page_shift, | |
| 1129 | ret = tce_iommu_create_window(container, create.page_shift, | 1129 | create.window_size, create.levels, |
| 1130 | create.window_size, create.levels, | 1130 | &create.start_addr); |
| 1131 | &create.start_addr); | ||
| 1132 | 1131 | ||
| 1133 | mutex_unlock(&container->lock); | 1132 | mutex_unlock(&container->lock); |
| 1134 | 1133 | ||