From patchwork Fri Feb 8 10:47:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 2115291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 9334CDF264 for ; Fri, 8 Feb 2013 10:50:25 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U3lV5-00059p-GY; Fri, 08 Feb 2013 10:48:11 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U3lUz-00056x-R6 for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2013 10:48:07 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MHW00MKLE03SKJ0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2013 19:48:03 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-2a-5114d7e3668b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 07.F9.03880.3E7D4115; Fri, 08 Feb 2013 19:48:03 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MHW009PWDZV5830@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2013 19:48:03 +0900 (KST) From: Marek Szyprowski To: linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH] ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation Date: Fri, 08 Feb 2013 11:47:40 +0100 Message-id: <1360320460-17246-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFJMWRmVeSWpSXmKPExsVy+t9jAd3H10UCDQ7+4rLY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZZ98vZi+Yw12x++UHlgbGLZxdjJwcEgImEve/L2aDsMUkLtxb D2RzcQgJLGKUWLN1OhOEs4FJ4t3mNhaQKjYBQ4mut11gHSICHhJPVpxjBiliFrjMKPG24Tsz SEJYIEJi+fE17CA2i4CqxLPbK8BsXqCGbVNmANkcQOsUJOZMspnAyL2AkWEVo2hqQXJBcVJ6 rpFecWJucWleul5yfu4mRrAPn0nvYFzVYHGIUYCDUYmHV+OscKAQa2JZcWXuIUYJDmYlEV7m XSKBQrwpiZVVqUX58UWlOanFhxilOViUxHkZTz0JEBJITyxJzU5NLUgtgskycXBKNTDOP3Kh a9I6Mfu7eRnf3p43esrjut/r5vKO3LqTfXGxVzuv1Sq6XH99rnfTXV05i/L3kQZdbSsWC2mz TlQ4f/3hzuhbxlOd95qUTyg5WZP8rmiiDs+W6j9rN7zzju7yalhx+4Ou/lb9gqhpnGVlFU+j GdqEGC71cEbNq2bqtXv9byrXgRvZi/uVWIozEg21mIuKEwHJoZiG3QEAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130208_054806_156975_9E884376 X-CRM114-Status: GOOD ( 10.85 ) X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 HDRS_LCASE Odd capitalization of message header Cc: Kyungmin Park , Hiroshi Doyu , Russell King - ARM Linux , Arnd Bergmann , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch removes page_address() usage in IOMMU-aware dma-mapping implementation and replaced it with direct use of the cpu virtual address provided by the caller. page_address() returned incorrect address for pages remapped in atomic pool, what caused memory leak. Reported-by: Hiroshi Doyu Signed-off-by: Marek Szyprowski Tested-by: Hiroshi Doyu --- arch/arm/mm/dma-mapping.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 6b2fb87..8c38378 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1255,11 +1255,11 @@ err_mapping: return NULL; } -static void __iommu_free_atomic(struct device *dev, struct page **pages, +static void __iommu_free_atomic(struct device *dev, void *cpu_addr, dma_addr_t handle, size_t size) { __iommu_remove_mapping(dev, handle, size); - __free_from_pool(page_address(pages[0]), size); + __free_from_pool(cpu_addr, size); } static void *arm_iommu_alloc_attrs(struct device *dev, size_t size, @@ -1342,7 +1342,7 @@ void arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr, } if (__in_atomic_pool(cpu_addr, size)) { - __iommu_free_atomic(dev, pages, handle, size); + __iommu_free_atomic(dev, cpu_addr, handle, size); return; }