]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vfio: selftests: fix crash in vfio_dma_mapping_mmio_test
authorAlex Mastro <amastro@fb.com>
Tue, 3 Mar 2026 19:46:24 +0000 (11:46 -0800)
committerAlex Williamson <alex@shazbot.org>
Tue, 10 Mar 2026 17:56:01 +0000 (11:56 -0600)
Remove the __iommu_unmap() call on a region that was never mapped.
When __iommu_map() fails (expected for MMIO vaddrs in non-VFIO
modes), the region is not added to the dma_regions list, leaving its
list_head zero-initialized. If the unmap ioctl returns success,
__iommu_unmap() calls list_del_init() on this zeroed node and crashes.

This fixes the iommufd_compat_type1 and iommufd_compat_type1v2
test variants.

Fixes: 080723f4d4c3 ("vfio: selftests: Add vfio_dma_mapping_mmio_test")
Signed-off-by: Alex Mastro <amastro@fb.com>
Reviewed-by: David Matlack <dmatlack@google.com>
Reviewed-by: Yuan Yao <yaoyuan@linux.alibaba.com>
Link: https://lore.kernel.org/r/20260303-fix-mmio-test-v1-1-78b4a9e46a4e@fb.com
Signed-off-by: Alex Williamson <alex@shazbot.org>
tools/testing/selftests/vfio/vfio_dma_mapping_mmio_test.c

index 957a89ce7b3a029b0bac2751d4e159e80d8ffa96..d7f25ef776715837b4212b14f7481c73bef719cd 100644 (file)
@@ -100,7 +100,6 @@ static void do_mmio_map_test(struct iommu *iommu,
                iommu_unmap(iommu, &region);
        } else {
                VFIO_ASSERT_NE(__iommu_map(iommu, &region), 0);
-               VFIO_ASSERT_NE(__iommu_unmap(iommu, &region, NULL), 0);
        }
 }