]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
udmabuf: use sgtable-based scatterlist wrappers
authorMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 7 May 2025 16:09:12 +0000 (18:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:20 +0000 (11:04 +0100)
commit afe382843717d44b24ef5014d57dcbaab75a4052 upstream.

Use common wrappers operating directly on the struct sg_table objects to
fix incorrect use of scatterlists sync calls. dma_sync_sg_for_*()
functions have to be called with the number of elements originally passed
to dma_map_sg_*() function, not the one returned in sgtable's nents.

Fixes: 1ffe09590121 ("udmabuf: fix dma-buf cpu access")
CC: stable@vger.kernel.org
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20250507160913.2084079-3-m.szyprowski@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/dma-buf/udmabuf.c

index 597a92438afc144f2dd1fcc8c8c0b9106cf4a15b..4264d88a5e6b4d25f97666fa44e597839dba9546 100644 (file)
@@ -127,8 +127,7 @@ static int begin_cpu_udmabuf(struct dma_buf *buf,
                        ubuf->sg = NULL;
                }
        } else {
-               dma_sync_sg_for_cpu(dev, ubuf->sg->sgl, ubuf->sg->nents,
-                                   direction);
+               dma_sync_sgtable_for_cpu(dev, ubuf->sg, direction);
        }
 
        return ret;
@@ -143,7 +142,7 @@ static int end_cpu_udmabuf(struct dma_buf *buf,
        if (!ubuf->sg)
                return -EINVAL;
 
-       dma_sync_sg_for_device(dev, ubuf->sg->sgl, ubuf->sg->nents, direction);
+       dma_sync_sgtable_for_device(dev, ubuf->sg, direction);
        return 0;
 }