]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
dma-mapping: avoid random addr value print out on error path
authorJiri Pirko <jiri@nvidia.com>
Mon, 9 Feb 2026 15:38:05 +0000 (16:38 +0100)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 23 Feb 2026 07:26:54 +0000 (08:26 +0100)
dma_addr is unitialized in dma_direct_map_phys() when swiotlb is forced
and DMA_ATTR_MMIO is set which leads to random value print out in
warning. Fix that by just returning DMA_MAPPING_ERROR.

Fixes: e53d29f957b3 ("dma-mapping: convert dma_direct_*map_page to be phys_addr_t based")
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20260209153809.250835-2-jiri@resnulli.us
kernel/dma/direct.h

index f476c63b668c90220a7802ad482b4e65617f1cc3..e89f175e9c2d0161e89a2c8b4a9b7eb57bec61d9 100644 (file)
@@ -85,7 +85,7 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev,
 
        if (is_swiotlb_force_bounce(dev)) {
                if (attrs & DMA_ATTR_MMIO)
-                       goto err_overflow;
+                       return DMA_MAPPING_ERROR;
 
                return swiotlb_map(dev, phys, size, dir, attrs);
        }