Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5898291 authored by Marek Szyprowski's avatar Marek Szyprowski
Browse files

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: default avatarHiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarHiroshi Doyu <hdoyu@nvidia.com>
parent 60460abf

arch/arm/mm/dma-mapping.c

+3 −3
Original line number Diff line number Diff line
@@ -1292,11 +1292,11 @@ static void *__iommu_alloc_atomic(struct device *dev, size_t size, 
	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;

	}