Merge tag 'dma-mapping-5.10-2' of git://git.infradead.org/users/hch/dma-mapping (bb3540be) · Commits · 戴 / test

Pull dma-mapping fix from Christoph Hellwig: "Fix an integer overflow on 32-bit platforms in the new DMA range code (Geert Uytterhoeven)" * tag 'dma-mapping-5.10-2' of git://git.infradead.org/users/hch/dma-mapping: dma-mapping: fix 32-bit overflow with CONFIG_ARM_LPAE=n

drivers/of/device.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ int of_dma_configure_id(struct device dev, struct device_node np,
		{
		const struct iommu_ops *iommu;
		const struct bus_dma_region *map = NULL;
		dma_addr_t dma_start = 0;
		u64 dma_start = 0;
		u64 mask, end, size = 0;
		bool coherent;
		int ret;
		@@ -109,10 +109,10 @@ int of_dma_configure_id(struct device dev, struct device_node np,
		return ret == -ENODEV ? 0 : ret;
		} else {
		const struct bus_dma_region *r = map;
		dma_addr_t dma_end = 0;
		u64 dma_end = 0;

		/* Determine the overall bounds of all DMA regions */
		for (dma_start = ~(dma_addr_t)0; r->size; r++) {
		for (dma_start = ~0ULL; r->size; r++) {
		/* Take lower and upper limits */
		if (r->dma_start < dma_start)
		dma_start = r->dma_start;

Admin message