ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation

This patch removes page_address() usage in IOMMU-aware dma-mapping
implementation and replaced it with direct use of the cpu virtual address
provided by the caller. page_address() returned incorrect address for
pages remapped in atomic pool, what caused memory leak.

Reported-by: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Hiroshi Doyu <hdoyu@nvidia.com>

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 6e2511561c3eccc3975f33c8a3a7782171e5116a..c7e3759f16d303c8c989af0a903f768f358c0e4f 100644 (file)
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1292,11 +1292,11 @@ err_mapping:
        return NULL;
 }
 
-static void __iommu_free_atomic(struct device *dev, struct page **pages,
+static void __iommu_free_atomic(struct device *dev, void *cpu_addr,
                                dma_addr_t handle, size_t size)
 {
        __iommu_remove_mapping(dev, handle, size);
-       __free_from_pool(page_address(pages[0]), size);
+       __free_from_pool(cpu_addr, size);
 }
 
 static void *arm_iommu_alloc_attrs(struct device *dev, size_t size,
@@ -1379,7 +1379,7 @@ void arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr,
        }
 
        if (__in_atomic_pool(cpu_addr, size)) {
-               __iommu_free_atomic(dev, pages, handle, size);
+               __iommu_free_atomic(dev, cpu_addr, handle, size);
                return;
        }