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 4E77B3815F8; Sat, 12 Sep 2026 19:54:11 +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=1789242852; cv=none; b=biHYwFbER3mlv94d0lQdHa7T/meat0McWAPecAc2Yk7EYRBUVNDNjrGuLjGShqcZggbSdY4rzJsQTNAcmKStml7NvBm1E3j8Rh1t/NWJ20HvuiJ1HnSppVulx0cwx/XE2GthhdgxzPKGk6Ria0q96/u/HHEFcm6n+uDxF3GDL8w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789242852; c=relaxed/simple; bh=WyREFiaiuR+y4aQ9zdid23j4j2KO/5UgMTGlux1ByYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qGt1CjpMowsBFnYIYtB5EcEum3UyyxXjOKvAc0Cz6wS4AMdSXWViEZdmm8q/26rKAT7EovMX+T8LOX6WmOvu+AAurhNZ1BzYEseMXyvZTweXSEPf1yWofF7lt5KKWhBW/7F+NM5XTVqb6fXIaoW7cSEKCxdSBCMMdneOT4YEjug= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DuoCY/3m; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DuoCY/3m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 017E11F000FF; Sat, 12 Sep 2026 19:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789242850; bh=f0GgsSDJm2DFG6L5RLAl47U/lB+ybL2U0KUHrs+SH1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DuoCY/3mKiZ7Grrfc0LxKEESa2iW25mPGP3Pl++Es1D1CeMgam6UTQDWpeXylfsB6 K9qp/tEHqRAi9ArotNGYKoHTx1QtQLlPz43XuSxr/THkU3ee/WaoOnMhGkbvT2ZZKJ cagyxIttjJygQTxvZZOV657plzxpY5VTqxsU5XX4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Gunthorpe , Michael Kelley , Mostafa Saleh , Petr Tesarik , "Aneesh Kumar K.V (Arm)" , Marek Szyprowski , Sasha Levin Subject: [PATCH 5.10 549/798] iommu/dma: Check atomic pool allocation result directly Date: Sat, 12 Sep 2026 09:02:57 +0200 Message-ID: <20260912065529.711633111@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065516.948645775@linuxfoundation.org> References: <20260912065516.948645775@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aneesh Kumar K.V (Arm) [ Upstream commit af95a0ebc0a0db0762be75f51eadf770bad01aaa ] The non-blocking, non-coherent allocation path uses dma_alloc_from_pool(), which returns the allocated page and fills cpu_addr only on success. Do not rely on cpu_addr to detect allocation failure in this path. Check the returned page directly before using it for the IOMMU mapping. Fixes: 9420139f516d ("dma-pool: fix coherent pool allocations for IOMMU mappings") Reviewed-by: Jason Gunthorpe Tested-by: Michael Kelley Tested-by: Mostafa Saleh Reviewed-by: Petr Tesarik Signed-off-by: Aneesh Kumar K.V (Arm) Link: https://lore.kernel.org/r/20260717180442.110954-4-aneesh.kumar@kernel.org Signed-off-by: Marek Szyprowski Signed-off-by: Sasha Levin --- drivers/iommu/dma-iommu.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index d1539b7399a96..62dd195d88062 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1038,13 +1038,16 @@ static void *iommu_dma_alloc(struct device *dev, size_t size, } if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && - !gfpflags_allow_blocking(gfp) && !coherent) + !gfpflags_allow_blocking(gfp) && !coherent) { page = dma_alloc_from_pool(dev, PAGE_ALIGN(size), &cpu_addr, - gfp, NULL); - else + gfp, NULL); + if (!page) + return NULL; + } else { cpu_addr = iommu_dma_alloc_pages(dev, size, &page, gfp, attrs); - if (!cpu_addr) - return NULL; + if (!cpu_addr) + return NULL; + } *handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot, dev->coherent_dma_mask); -- 2.53.0