Commit b33d7062 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux 

Pull iommu fixes from Joerg Roedel:

 - AMD IOMMU: Fix potential NULL-ptr dereference in error path
   of amd_iommu_probe_device()

 - Generic IOMMUPT: Fix another compiler issue seen with older
   compiler versions

 - Fix signedness issue in ARM IO-PageTable code

* tag 'iommu-fixes-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux:
  iommu/io-pgtable-arm: fix size_t signedness bug in unmap path
  iommupt: Make it clearer to the compiler that pts.level == 0 for single page
  iommu/amd: Fix error path in amd_iommu_probe_device()
parents c133687c 374e7af6

drivers/iommu/amd/iommu.c

+1 −2
Original line number Diff line number Diff line
@@ -2450,8 +2450,6 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) 
		goto out_err;

	}



out_err:



	iommu_completion_wait(iommu);



	if (FEATURE_NUM_INT_REMAP_SUP_2K(amd_iommu_efr2))
@@ -2462,6 +2460,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) 
	if (dev_is_pci(dev))

		pci_prepare_ats(to_pci_dev(dev), PAGE_SHIFT);



out_err:

	return iommu_dev;

}

drivers/iommu/generic_pt/iommu_pt.h

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static __always_inline int __do_map_single_page(struct pt_range *range, 
	struct pt_iommu_map_args *map = arg;



	pts.type = pt_load_single_entry(&pts);

	if (level == 0) {

	if (pts.level == 0) {

		if (pts.type != PT_ENTRY_EMPTY)

			return -EADDRINUSE;

		pt_install_leaf_entry(&pts, map->oa, PAGE_SHIFT,

drivers/iommu/io-pgtable-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, 
	pte = READ_ONCE(*ptep);

	if (!pte) {

		WARN_ON(!(data->iop.cfg.quirks & IO_PGTABLE_QUIRK_NO_WARN));

		return -ENOENT;

		return 0;

	}



	/* If the size matches this level, we're in the right place */