提交 7c03f428 编写于 作者: K Kirti Wankhede 提交者: Alex Williamson

vfio iommu type1: Fix size argument to vfio_find_dma() during DMA UNMAP.

Passing zero for the size to vfio_find_dma() isn't compatible with
matching the start address of an existing vfio_dma. Doing so triggers a
corner case. In vfio_find_dma(), when the start address is equal to
dma->iova and size is 0, check for the end of search range makes it to
take wrong side of RB-tree. That fails the search even though the address
is present in mapped dma ranges. Due to this, in vfio_dma_do_unmap(),
while checking boundary conditions, size should be set to 1 for verifying
start address of unmap range.
vfio_find_dma() is also used to verify last address in unmap range with
size = 0, but in that case address to be searched is calculated with
start + size - 1 and so it works correctly.
Signed-off-by: NKirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: NNeo Jia <cjia@nvidia.com>
[aw: changelog tweak]
Signed-off-by: NAlex Williamson <alex.williamson@redhat.com>
上级 3cedd7d7
...@@ -826,7 +826,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu, ...@@ -826,7 +826,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
* mappings within the range. * mappings within the range.
*/ */
if (iommu->v2) { if (iommu->v2) {
dma = vfio_find_dma(iommu, unmap->iova, 0); dma = vfio_find_dma(iommu, unmap->iova, 1);
if (dma && dma->iova != unmap->iova) { if (dma && dma->iova != unmap->iova) {
ret = -EINVAL; ret = -EINVAL;
goto unlock; goto unlock;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册