From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 824F3C44529 for ; Tue, 21 Jul 2026 14:41:53 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4h4KpR6BFyz2xqJ; Wed, 22 Jul 2026 00:41:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1784644911; cv=none; b=Q9cMr/v2zCfnpz5DOqP1C65wyMB/DJ18H8gI3YDvNApwDinCXzSrFj7xHYoqWxhZkKhyxqCYdyEqHhBTIAkyfbelTyYM4VIo01aHzoTLSShSNtq1TOe4RyqbVvwt5tt/LfrhBkkeVhcYTDy/AeIVvrTWsTkQN9qsFt+avbTQlPJxCLRgTAw3ciVpniD4LGaLLFxhW1DGaGU1xLQlh7IBhSr3+huG1imjcf05txe9NpYK/bISi7mIhy9zEu3AHJJ/56BDa+VcFu5giFsGQz9hgw2wpY17a69XV8cDQsvVMebAoV31EgUBSSqgX4BLwKGH0Scx0OoOQHzgiF/RlloKTQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1784644911; c=relaxed/relaxed; bh=cbjfsvMUtOM597sXFYSy4LMyCCKlivTlN6bg0GYZbig=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=JpyP0a4/desGfO6IRhSTwpaJr/AZ3FJsbDlV8sLk3/28marFUeEsv/XP0+jVGB7edSOKwAfRKx3eDAXrkaXJbaV2ZQZ6kxlYNdWQEYePWJBh0Fuj7QR0vovJo/GTlR+kMrJpOMlm7OJE7tmD8EYqLNUnqbfD4k1Zhpe709RT+92M+28M2fk9xN5SSc/N6ZcNbHLrmMHHrTyEyz5YL6owOnMyv19IkjU9+8CamVB+tNmnV9mSKAUclJ122su5hWbQ96iV01RoAZ9mRW1ZiO+zWu34fqdLHbEUOkUiq4xh0x6tnI5uWXR4usvFhXIZnOSOPJW9eSYhsUzrOkhzxzEbJg== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=a9sMx8Tl; dkim-atps=neutral; spf=pass (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=aneesh.kumar@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=a9sMx8Tl; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=aneesh.kumar@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4h4KpQ5kgBz2xJR for ; Wed, 22 Jul 2026 00:41:50 +1000 (AEST) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id EB94842D81; Tue, 21 Jul 2026 14:41:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9F6E1F00AC4; Tue, 21 Jul 2026 14:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784644908; bh=cbjfsvMUtOM597sXFYSy4LMyCCKlivTlN6bg0GYZbig=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=a9sMx8TlLU2rGUvpHoxNcYyMDx/kraTiQ25aOr5lNDOnmZaWccTNeAMKsWTIfXblc Ep70skfYp6qXTCsQAA/kIwueiGEp4e7ZiYRPJYNmsnVW0fa1/6Hqf2cphc4qIQ78FB xwK26DYrQnIMXproaXvVtR8riyHv/FmjZBQcRCCIz3L556YvFQ4sx8zc70mUNJOkMX y/G46IpQzBIjnS7IWD7Id+pYRhSq5V+YCyP0xMGyXBEG0eqv0Jj39WI9et8O6YsJoq /1FpVoYDunZEVtzPRG/eSUAmdBc/cDXEl8oWt4qLu7jZ4duE3/2D5WVldSKMmAXEVv 0Uyp0VWxjGPYQ== X-Mailer: emacs 30.2 (via feedmail 11-beta-1 I) From: Aneesh Kumar K.V To: Leon Romanovsky Cc: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, 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, Jason Gunthorpe , Michael Kelley Subject: Re: [PATCH v8 02/23] dma-pool: fix page leak in atomic_pool_expand() cleanup In-Reply-To: <20260721123107.GJ110966@unreal> References: <20260717180442.110954-1-aneesh.kumar@kernel.org> <20260717180442.110954-3-aneesh.kumar@kernel.org> <20260721123107.GJ110966@unreal> Date: Tue, 21 Jul 2026 20:11:34 +0530 Message-ID: X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain Leon Romanovsky writes: > On Fri, Jul 17, 2026 at 11:34:20PM +0530, Aneesh Kumar K.V (Arm) wrote: >> 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. >> >> Reviewed-by: Jason Gunthorpe >> 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; > > Instead of doing this dance with temporal variable, change "goto out" to > be "return true". > I didn't follow the return true part. A failure in set_memory_encrypted() or set_memory_decrypted() requires the pages to be leaked, so this is not the only call site that sets leak_pages = true. There is a similar case a few lines above. > >> } >> remove_mapping: >> #ifdef CONFIG_DMA_DIRECT_REMAP >> dma_common_free_remap(addr, pool_size); >> free_page: > > Remove free_page label, and change leftover of "goto free_page" to be > "goto out" > >> - __free_pages(page, order); >> #endif >> + if (!leak_pages) >> + __free_pages(page, order); > > Put these checks under out label and rely on page != NULL as a marker. > if (page) > __free_pages(page, order); > >> out: >> return ret; >> } >> -- >> 2.43.0 >> >> -aneesh