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 A4D662E06E4; Sat, 12 Sep 2026 12:38:12 +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=1789216693; cv=none; b=iQL/eC/E7zgg7NTpTPNbLq8nS/PlVm0uunncMvRKtaZ8PpILLfOJFKI6WKvot0iVjiiHDqeigU3IAPav4NdC7KBomtAKm3I9y9ixvfq1rZxUvbmpKDj5XoZqtfmtdbhEQ/bWOsn353z4el4t6f5HhASCtopdf1sMoCEtAbhgIjQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789216693; c=relaxed/simple; bh=K3j2mlZfygqCYFERp8xJjjIZlOajDuOV0rmzU1wSvLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=URtCUWaDF5wpv+d/O4ybGBAB09i0IS3D95pXM/V5SD1WhgaEPpW7YCQ2S+5ba6gjzl9qIZZQygwrScO12DHwqC6WLD1z22nH0B5biMPdLpPj/HUHYXXc+WVBzRPBWIb0OJP6II9udcY6xTvk1Gd0nc1oTvf+kF1ZzSxbLVN3zlo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S7xR7rak; 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="S7xR7rak" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A88341F000FF; Sat, 12 Sep 2026 12:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789216692; bh=j/Q7JxACYMKAisJw5PYnfZG2Kzb7lski472MU1KKDig=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S7xR7rakA6NfjKa4NAXGKaK+hr5wVg6DjR+T+5U86i7yL8SCgPVNGMfjpZoh4g7PF 66pa9rbWd6e1byQkIoFqlPeoNSIffGWFE6xEn4eSMKU9NdfgUD2LmMQjqOcOzQ8O2Z TgFJrAzBH1gYWDfE6Fj5GCt5K6aWF5Db/GpnXink= 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.12 0786/1376] iommu/dma: Check atomic pool allocation result directly Date: Sat, 12 Sep 2026 08:53:32 +0200 Message-ID: <20260912065625.054347643@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@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.12-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 0f0caf59023c7..059463664b418 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1648,13 +1648,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