Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'dma-mapping-5.10-2' of git://git.infradead.org/users/hch/dma-mapping

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

+3 -3
+3 -3
drivers/of/device.c
··· 93 93 { 94 94 const struct iommu_ops *iommu; 95 95 const struct bus_dma_region *map = NULL; 96 - dma_addr_t dma_start = 0; 96 + u64 dma_start = 0; 97 97 u64 mask, end, size = 0; 98 98 bool coherent; 99 99 int ret; ··· 109 109 return ret == -ENODEV ? 0 : ret; 110 110 } else { 111 111 const struct bus_dma_region *r = map; 112 - dma_addr_t dma_end = 0; 112 + u64 dma_end = 0; 113 113 114 114 /* Determine the overall bounds of all DMA regions */ 115 - for (dma_start = ~(dma_addr_t)0; r->size; r++) { 115 + for (dma_start = ~0ULL; r->size; r++) { 116 116 /* Take lower and upper limits */ 117 117 if (r->dma_start < dma_start) 118 118 dma_start = r->dma_start;