aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2015-04-29 11:09:18 -0400
committerWill Deacon <will.deacon@arm.com>2015-04-29 12:39:39 -0400
commit2cff98b99c469880ce830cbcde015b53b67e0a7b (patch)
treed661a5897d1c01ba80a980be63332a95dfb7cc61 /arch/arm64
parent6829e274a623187c24f7cfc0e3d35f25d087fcc5 (diff)
arm64: add missing PAGE_ALIGN() to __dma_free()
__dma_alloc() does a PAGE_ALIGN() on the passed in size argument before doing anything else. __dma_free() does not. And because it doesn't, it is possible to leak memory should size not be an integer multiple of PAGE_SIZE. The solution is to add a PAGE_ALIGN() to __dma_free() like is done in __dma_alloc(). Additionally, this patch removes a redundant PAGE_ALIGN() from __dma_alloc_coherent(), since __dma_alloc_coherent() can only be called from __dma_alloc(), which already does a PAGE_ALIGN() before the call. Cc: stable@vger.kernel.org Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/mm/dma-mapping.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index e0f14ee26b68..b0bd4e5fd5cf 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -104,7 +104,6 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size,
104 struct page *page; 104 struct page *page;
105 void *addr; 105 void *addr;
106 106
107 size = PAGE_ALIGN(size);
108 page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT, 107 page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,
109 get_order(size)); 108 get_order(size));
110 if (!page) 109 if (!page)
@@ -193,6 +192,8 @@ static void __dma_free(struct device *dev, size_t size,
193{ 192{
194 void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle)); 193 void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle));
195 194
195 size = PAGE_ALIGN(size);
196
196 if (!is_device_dma_coherent(dev)) { 197 if (!is_device_dma_coherent(dev)) {
197 if (__free_from_pool(vaddr, size)) 198 if (__free_from_pool(vaddr, size))
198 return; 199 return;