From: Marek Szyprowski Date: Fri, 8 Feb 2013 09:54:48 +0000 (+0100) Subject: ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation X-Git-Tag: next-20130218~11^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee06158e9cf9e5261da23ff39a0c372bb532fc77;p=karo-tx-linux.git 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 Signed-off-by: Marek Szyprowski Tested-by: Hiroshi Doyu --- diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 39ba91c02527..fc57f1a06241 100644 --- 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; }