dmaengine: ti: omap-dma: Initialize sglen after allocation

With the new __counted_by annocation, the "sglen" struct member must
be set before accessing the "sg" array. This initialization was done in
other places where a new struct omap_desc is allocated, but these cases
were missed. Set "sglen" after allocation.

Fixes: b85178611c11 ("dmaengine: ti: omap-dma: Annotate struct omap_desc with __counted_by")
Signed-off-by: Kees Cook <kees@kernel.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20240716215702.work.802-kees@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index 7e6c04afbe892d519ad1dc77e7c4397e2732e402..6ab9bfbdc4809e95d74576a488f81cbf6c4983ac 100644 (file)
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1186,10 +1186,10 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic(
        d->dev_addr = dev_addr;
        d->fi = burst;
        d->es = es;
+       d->sglen = 1;
        d->sg[0].addr = buf_addr;
        d->sg[0].en = period_len / es_bytes[es];
        d->sg[0].fn = buf_len / period_len;
-       d->sglen = 1;
 
        d->ccr = c->ccr;
        if (dir == DMA_DEV_TO_MEM)
@@ -1258,10 +1258,10 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_memcpy(
        d->dev_addr = src;
        d->fi = 0;
        d->es = data_type;
+       d->sglen = 1;
        d->sg[0].en = len / BIT(data_type);
        d->sg[0].fn = 1;
        d->sg[0].addr = dest;
-       d->sglen = 1;
        d->ccr = c->ccr;
        d->ccr |= CCR_DST_AMODE_POSTINC | CCR_SRC_AMODE_POSTINC;
 
@@ -1309,6 +1309,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_interleaved(
        if (data_type > CSDP_DATA_TYPE_32)
                data_type = CSDP_DATA_TYPE_32;
 
+       d->sglen = 1;
        sg = &d->sg[0];
        d->dir = DMA_MEM_TO_MEM;
        d->dev_addr = xt->src_start;
@@ -1316,7 +1317,6 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_interleaved(
        sg->en = xt->sgl[0].size / BIT(data_type);
        sg->fn = xt->numf;
        sg->addr = xt->dst_start;
-       d->sglen = 1;
        d->ccr = c->ccr;
 
        src_icg = dmaengine_get_src_icg(xt, &xt->sgl[0]);