3.19.8-ckt1 -stable review patch. If anyone has any objections, please let me know.
------------------ 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. Acked-by: Catalin Marinas <[email protected]> Signed-off-by: Dean Nelson <[email protected]> Signed-off-by: Will Deacon <[email protected]> [ Dean Nelson: backport to 3.19-stable ] Signed-off-by: Kamal Mostafa <[email protected]> --- arch/arm64/mm/dma-mapping.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6efbb52..7980c2a 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -133,7 +133,7 @@ static void __dma_free_coherent(struct device *dev, size_t size, freed = dma_release_from_contiguous(dev, phys_to_page(paddr), - size >> PAGE_SHIFT); + PAGE_ALIGN(size) >> PAGE_SHIFT); if (!freed) swiotlb_free_coherent(dev, size, vaddr, dma_handle); } @@ -189,6 +189,8 @@ static void __dma_free_noncoherent(struct device *dev, size_t size, { void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle)); + size = PAGE_ALIGN(size); + if (__free_from_pool(vaddr, size)) return; vunmap(vaddr); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
