Patch "arm64: add missing PAGE_ALIGN() to __dma_free()" has been added to the 4.0-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
arm64: add missing PAGE_ALIGN() to __dma_free()
to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-add-missing-page_align-to-__dma_free.patch
and it can be found in the queue-4.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
2cff98b99c469880ce830cbcde015b53b67e0a7bMon Sep 17 00:00:00 2001
From: Dean Nelson <[email protected]>
Date: Wed, 29 Apr 2015 16:09:18 +0100
Subject: arm64: add missing PAGE_ALIGN() to __dma_free()
From: Dean Nelson <[email protected]>
commit 2cff98b99c469880ce830cbcde015b53b67e0a7b upstream.
__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.
--- arch/arm64/mm/dma-mapping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/mm/dma-mapping.c +2 -1
@@ -104,7 +104,6 @@ static void *__dma_alloc_coherent(structstruct page *page;void *addr; - size =PAGE_ALIGN (size); page =dma_alloc_from_contiguous (dev, size >>PAGE_SHIFT ,get_order (size));if (!page)
@@ -193,6 +192,8 @@ static void __dma_free(struct device *de {void *swiotlb_addr =phys_to_virt (dma_to_phys (dev, dma_handle)); + size =PAGE_ALIGN (size); +if (!is_device_dma_coherent (dev)) {if (__free_from_pool (vaddr, size))return ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.0/arm64-add-missing-page_align-to-__dma_free.patch