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 C5112288B2; Sat, 12 Sep 2026 10:28:20 +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=1789208902; cv=none; b=aEr3p7g7MQzHMzvpymjuDdFzDAbBCelrokX/vYH0PGDAReNQEV+kcykEhp+gkbagIp5R3TAXjZzfujb4JKWXz1f/pWMLXSGVlbz/xap482sqWxKO6bOAdRZMUbsIwpdCR1TvlZNiEJ0mZrO/ee/f1VJ75Aw+lAMfBYk4TXhzLGg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789208902; c=relaxed/simple; bh=WAKbj8U8ozaraMuJRJ2sMHdqcs3XycbW5DzkqTVpWZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qr515W/zTcc/3bBUavdI0oDT1wJdO3PXhnBDYg4e5Rcj58NAKvZpv87UMDSizWEL/TbzEJIVyX1zmcJA/Q8qsoQA8ZeHa4co1Rswy/Aq/95KJoEFXO85cRPFimzNhO7sTeSQEf4Z6wo/cOPRTIbj8NcLbfGEqlT0cLYuNIDqjhk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PSTDn5BM; 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="PSTDn5BM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA76A1F000FF; Sat, 12 Sep 2026 10:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789208900; bh=a6Dw+qdgkMHdPBJyQUpg6OkCCXSrKVUyuVlik1R1JOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PSTDn5BM0rSsO0i8m3che40C1R2rfBgxSNR8ADiyPoYKNyhX2GBPBwRUY/tzfXtzP FvxmX1sLMtTQ+BfXvR2iEcMQf32BloFizCz9cIkZAC+EPYX5AxrIdgTJOaMLAX4KkQ hfoX2tLKe4a5g4yQNjs375mVCHfJ7crnhd7czNm8= 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 6.18 0712/1518] iommu/dma: Check atomic pool allocation result directly Date: Sat, 12 Sep 2026 08:48:01 +0200 Message-ID: <20260912065639.539397602@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@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 6.18-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 b0dca7e7429a6..3773984068684 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1647,13 +1647,16 @@ void *iommu_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, } 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