Commit 29fcea8c authored Jun 17, 2019 by Arnd Bergmann Committed by Joerg Roedel Jun 18, 2019

iommu: Fix integer truncation



On 32-bit architectures, phys_addr_t may be different from dma_add_t,
both smaller and bigger. This can lead to an overflow during an assignment
that clang warns about:

drivers/iommu/dma-iommu.c:230:10: error: implicit conversion from 'dma_addr_t' (aka 'unsigned long long') to
      'phys_addr_t' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion]

Use phys_addr_t here because that is the type that the variable was
declared as.

Fixes: aadad097 ("iommu/dma: Reserve IOVA for PCIe inaccessible DMA address")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 58b55c85

drivers/iommu/dma-iommu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -240,8 +240,8 @@ static int iova_reserve_pci_windows(struct pci_dev *dev,
		start = window->res->end - window->offset + 1;
		/* If window is last entry */
		if (window->node.next == &bridge->dma_ranges &&
		end != ~(dma_addr_t)0) {
		end = ~(dma_addr_t)0;
		end != ~(phys_addr_t)0) {
		end = ~(phys_addr_t)0;
		goto resv_iova;
		}
		}