From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E559737AA66; Wed, 1 Jul 2026 05:50:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782885007; cv=none; b=Wqvg284RBzmZ7vHSKckbOFa3Z7yLjp/AITSmXTleQ+OKZEaZ8oZ1ReJoJGxN/TVtag9Ysl3+Bh4oaCVlWxLc3U7YMMPsYoxaoWfllMz0NOyUoQRSu6L12s+ISU+yEh1tv3WktadjcQaU/hl07hE6Hs6CsQKExpetxg3C0KhKunk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782885007; c=relaxed/simple; bh=zjrTFFJTF+0LUM6y1NQ+bFpwvWbXP11LMsscgiL0JeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bpqy0qTPnLmTRyrANbNdBNrJD1eK1P+nJ2gsqdQDBXWoJwkcbznYiP+TJurgYpDG4uGF4vab7XqjoXYCcfWZO4M9QHzrZb2EIgOZGCYXN1/QugU9ZdIfEZZEMyUfmQ3YcVRpaBCZmbMAyYNMlXnRVKhhVdBIRlkLuPLfkn5RoGE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oVUePrtd; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oVUePrtd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 628A81F00A3E; Wed, 1 Jul 2026 05:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782885006; bh=YM/kzkdd2b4wz0/QuPV8d4m9Lm+x6hpDFjkd4v2KLO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oVUePrtdGdfcHjX+cljzkAXWX8yQtKPyHxYbs9+rDOOIfIvI8HQob1dUJF+TOW/y0 fC5sqXl8TCTqr/8FrheOkNk8daMgGh8mpyaLj/+fVYuN40wIzhFqgHFJqQqshM2AAZ QmS72TRjtqkOOrJbTcnATbGlXL4fSZouBBLMvDsNWlaDXpAHcdKnbWVdTCKxRWvKLi FTiOEZh/3FHlbfRr7w7c+MZ7DEEe6AFLEpev1I+D+hE0x8kTOk80LKi5+7NbwXm/+H JynSNQfMR3DglTV2+o+PCwvEpadWmlRiKgqn7fA8aS8g9TTAXMf6o7W7ysUHuYt6E1 ytVN3wRJb/NYQ== From: "Aneesh Kumar K.V (Arm)" To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev Cc: "Aneesh Kumar K.V (Arm)" , Robin Murphy , Marek Szyprowski , Will Deacon , Marc Zyngier , Steven Price , Suzuki K Poulose , Catalin Marinas , Jiri Pirko , Jason Gunthorpe , Mostafa Saleh , Petr Tesarik , Alexey Kardashevskiy , Dan Williams , Xu Yilun , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , x86@kernel.org, Michael Kelley Subject: [PATCH v7 02/22] dma-pool: fix page leak in atomic_pool_expand() cleanup Date: Wed, 1 Jul 2026 11:19:06 +0530 Message-ID: <20260701054926.825925-3-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260701054926.825925-1-aneesh.kumar@kernel.org> References: <20260701054926.825925-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit atomic_pool_expand() frees the allocated pages from the remove_mapping error path only when CONFIG_DMA_DIRECT_REMAP is enabled. When CONFIG_DMA_DIRECT_REMAP is disabled, failures after page allocation, such as gen_pool_add_virt(), jump to remove_mapping and return without freeing the pages. Move __free_pages(page, order) out of the CONFIG_DMA_DIRECT_REMAP block so that cleanup paths always release the allocation. Tested-by: Michael Kelley Tested-by: Mostafa Saleh Signed-off-by: Aneesh Kumar K.V (Arm) --- kernel/dma/pool.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c index 2b2fbb709242..b0303efbc153 100644 --- a/kernel/dma/pool.c +++ b/kernel/dma/pool.c @@ -81,6 +81,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size, { unsigned int order; struct page *page = NULL; + bool leak_pages = false; void *addr; int ret = -ENOMEM; @@ -115,8 +116,10 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size, */ ret = set_memory_decrypted((unsigned long)page_to_virt(page), 1 << order); - if (ret) + if (ret) { + leak_pages = true; goto remove_mapping; + } ret = gen_pool_add_virt(pool, (unsigned long)addr, page_to_phys(page), pool_size, NUMA_NO_NODE); if (ret) @@ -130,14 +133,15 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size, 1 << order); if (WARN_ON_ONCE(ret)) { /* Decrypt succeeded but encrypt failed, purposely leak */ - goto out; + leak_pages = true; } remove_mapping: #ifdef CONFIG_DMA_DIRECT_REMAP dma_common_free_remap(addr, pool_size); free_page: - __free_pages(page, order); #endif + if (!leak_pages) + __free_pages(page, order); out: return ret; } -- 2.43.0