Commit 950aeefb authored by Nicolin Chen's avatar Nicolin Chen Committed by Jason Gunthorpe
Browse files

iommufd/device: Fix hwpt at err_unresv in iommufd_device_do_replace() 

The rewind routine should remove the reserved iovas added to the new hwpt.

Fixes: 89db3163 ("iommufd: Derive iommufd_hwpt_paging from iommufd_hw_pagetable")
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/r/20240718050130.1956804-1-nicolinc@nvidia.com


Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 8400291e

drivers/iommu/iommufd/device.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ iommufd_device_do_replace(struct iommufd_device *idev, 
err_unresv:

	if (hwpt_is_paging(hwpt))

		iommufd_group_remove_reserved_iova(igroup,

						   to_hwpt_paging(old_hwpt));

						   to_hwpt_paging(hwpt));

err_unlock:

	mutex_unlock(&idev->igroup->lock);

	return ERR_PTR(rc);