Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933160AbbFEO3i (ORCPT ); Fri, 5 Jun 2015 10:29:38 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:59694 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932957AbbFEN7Y (ORCPT ); Fri, 5 Jun 2015 09:59:24 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Dean Nelson , Will Deacon , Luis Henriques Subject: [PATCH 3.16.y-ckt 049/110] arm64: add missing PAGE_ALIGN() to __dma_free() Date: Fri, 5 Jun 2015 14:57:32 +0100 Message-Id: <1433512713-22984-50-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433512713-22984-1-git-send-email-luis.henriques@canonical.com> References: <1433512713-22984-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2069 Lines: 55 3.16.7-ckt13 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Dean Nelson 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 Signed-off-by: Dean Nelson Signed-off-by: Will Deacon [ luis: backported to 3.16: based on Dean's 3.19 backport ] Signed-off-by: Luis Henriques --- 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 893802645efe..0ada77e5d9e7 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -86,7 +86,7 @@ static void __dma_free_coherent(struct device *dev, size_t size, dma_release_from_contiguous(dev, phys_to_page(paddr), - size >> PAGE_SHIFT); + PAGE_ALIGN(size) >> PAGE_SHIFT); } else { swiotlb_free_coherent(dev, size, vaddr, dma_handle); } @@ -138,6 +138,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); + vunmap(vaddr); __dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/