From patchwork Tue Apr 25 18:22:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 98225 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp2082606qgf; Tue, 25 Apr 2017 11:23:16 -0700 (PDT) X-Received: by 10.202.82.199 with SMTP id g190mr15155954oib.153.1493144596711; Tue, 25 Apr 2017 11:23:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c83si13116104oib.26.2017.04.25.11.23.16; Tue, 25 Apr 2017 11:23:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1952630AbdDYSWu (ORCPT + 15 others); Tue, 25 Apr 2017 14:22:50 -0400 Received: from foss.arm.com ([217.140.101.70]:45790 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1952591AbdDYSWg (ORCPT ); Tue, 25 Apr 2017 14:22:36 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 48F091682; Tue, 25 Apr 2017 11:22:31 -0700 (PDT) Received: from e104818-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 026BD3F4FF; Tue, 25 Apr 2017 11:22:29 -0700 (PDT) From: Catalin Marinas To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, geert@linux-m68k.org, a.hajda@samsung.com, robin.murphy@arm.com, Laura Abbott , Greg Kroah-Hartman Subject: [PATCH] arm64: Do not leave an invalid area->pages pointer in dma_common_contiguous_remap() Date: Tue, 25 Apr 2017 19:22:23 +0100 Message-Id: <1493144543-2497-1-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The dma_common_pages_remap() function allocates a vm_struct object and initialises the pages pointer to value passed as argument. However, when this function is called dma_common_contiguous_remap(), the pages array is only temporarily allocated, being freed shortly after dma_common_contiguous_remap() returns. Architecture code checking the validity of an area->pages pointer would incorrectly dereference already freed pointers. This has been exposed by the arm64 commit 44176bb38fa4 ("arm64: Add support for DMA_ATTR_FORCE_CONTIGUOUS to IOMMU"). Fixes: 513510ddba96 ("common: dma-mapping: introduce common remapping functions") Cc: Laura Abbott Cc: Greg Kroah-Hartman Reported-by: Andrzej Hajda Signed-off-by: Catalin Marinas --- This is for correctness since once the arm64's mmap and get_sgtable ops are fixed for DMA_ATTR_FORCE_CONTIGUOUS, we would no longer see the issue. Anyway, it's better to get this fixed in case others trip over a similar issue. I added a "Fixes" tag for completeness but I'm not sure it's worth back-porting. drivers/base/dma-mapping.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) Acked-by: Laura Abbott Reviewed-by: Robin Murphy diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index efd71cf4fdea..ab7071041141 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c @@ -277,8 +277,8 @@ EXPORT_SYMBOL(dma_common_mmap); * remaps an array of PAGE_SIZE pages into another vm_area * Cannot be used in non-sleeping contexts */ -void *dma_common_pages_remap(struct page **pages, size_t size, - unsigned long vm_flags, pgprot_t prot, +static struct vm_struct *__dma_common_pages_remap(struct page **pages, + size_t size, unsigned long vm_flags, pgprot_t prot, const void *caller) { struct vm_struct *area; @@ -287,13 +287,26 @@ void *dma_common_pages_remap(struct page **pages, size_t size, if (!area) return NULL; - area->pages = pages; - if (map_vm_area(area, prot, pages)) { vunmap(area->addr); return NULL; } + return area; +} + +void *dma_common_pages_remap(struct page **pages, size_t size, + unsigned long vm_flags, pgprot_t prot, + const void *caller) +{ + struct vm_struct *area; + + area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller); + if (!area) + return NULL; + + area->pages = pages; + return area->addr; } @@ -308,7 +321,7 @@ void *dma_common_contiguous_remap(struct page *page, size_t size, { int i; struct page **pages; - void *ptr; + struct vm_struct *area; unsigned long pfn; pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL); @@ -318,11 +331,13 @@ void *dma_common_contiguous_remap(struct page *page, size_t size, for (i = 0, pfn = page_to_pfn(page); i < (size >> PAGE_SHIFT); i++) pages[i] = pfn_to_page(pfn + i); - ptr = dma_common_pages_remap(pages, size, vm_flags, prot, caller); + area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller); kfree(pages); - return ptr; + if (!area) + return NULL; + return area->addr; } /*