]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vfio/type1: Fix error unwind in migration dirty bitmap allocation
authorLi RongQing <lirongqing@baidu.com>
Wed, 21 May 2025 03:46:47 +0000 (11:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:04 +0000 (11:04 +0100)
[ Upstream commit 4518e5a60c7fbf0cdff393c2681db39d77b4f87e ]

When setting up dirty page tracking at the vfio IOMMU backend for
device migration, if an error is encountered allocating a tracking
bitmap, the unwind loop fails to free previously allocated tracking
bitmaps.  This occurs because the wrong loop index is used to
generate the tracking object.  This results in unintended memory
usage for the life of the current DMA mappings where bitmaps were
successfully allocated.

Use the correct loop index to derive the tracking object for
freeing during unwind.

Fixes: d6a4c185660c ("vfio iommu: Implementation of ioctl for dirty pages tracking")
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Link: https://lore.kernel.org/r/20250521034647.2877-1-lirongqing@baidu.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/vfio/vfio_iommu_type1.c

index 9b01f88ae47629f604320427d5518450e0dab180..b2a543e7cac4544d0885a13f9c0f57c60bd7291c 100644 (file)
@@ -269,7 +269,7 @@ static int vfio_dma_bitmap_alloc_all(struct vfio_iommu *iommu, size_t pgsize)
                        struct rb_node *p;
 
                        for (p = rb_prev(n); p; p = rb_prev(p)) {
-                               struct vfio_dma *dma = rb_entry(n,
+                               struct vfio_dma *dma = rb_entry(p,
                                                        struct vfio_dma, node);
 
                                vfio_dma_bitmap_free(dma);