Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: sf-pdma: pdma_desc memory leak fix

Commit b2cc5c465c2c ("dmaengine: sf-pdma: Add multithread support for a
DMA channel") changed sf_pdma_prep_dma_memcpy() to unconditionally
allocate a new sf_pdma_desc each time it is called.

The driver previously recycled descs, by checking the in_use flag, only
allocating additional descs if the existing one was in use. This logic
was removed in commit b2cc5c465c2c ("dmaengine: sf-pdma: Add multithread
support for a DMA channel"), but sf_pdma_free_desc() was not changed to
handle the new behaviour.

As a result, each time sf_pdma_prep_dma_memcpy() is called, the previous
descriptor is leaked, over time leading to memory starvation:

unreferenced object 0xffffffe008447300 (size 192):
comm "irq/39-mchp_dsc", pid 343, jiffies 4294906910 (age 981.200s)
hex dump (first 32 bytes):
00 00 00 ff 00 00 00 00 b8 c1 00 00 00 00 00 00 ................
00 00 70 08 10 00 00 00 00 00 00 c0 00 00 00 00 ..p.............
backtrace:
[<00000000064a04f4>] kmemleak_alloc+0x1e/0x28
[<00000000018927a7>] kmem_cache_alloc+0x11e/0x178
[<000000002aea8d16>] sf_pdma_prep_dma_memcpy+0x40/0x112

Add the missing kfree() to sf_pdma_free_desc(), and remove the redundant
in_use flag.

Fixes: b2cc5c465c2c ("dmaengine: sf-pdma: Add multithread support for a DMA channel")
Signed-off-by: Shravan Chippa <shravan.chippa@microchip.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230120100623.3530634-1-shravan.chippa@microchip.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Shravan Chippa and committed by
Vinod Koul
b02e0701 a1beaa50

+1 -3
+1 -2
drivers/dma/sf-pdma/sf-pdma.c
··· 96 96 if (!desc) 97 97 return NULL; 98 98 99 - desc->in_use = true; 100 99 desc->dirn = DMA_MEM_TO_MEM; 101 100 desc->async_tx = vchan_tx_prep(&chan->vchan, &desc->vdesc, flags); 102 101 ··· 289 290 struct sf_pdma_desc *desc; 290 291 291 292 desc = to_sf_pdma_desc(vdesc); 292 - desc->in_use = false; 293 + kfree(desc); 293 294 } 294 295 295 296 static void sf_pdma_donebh_tasklet(struct tasklet_struct *t)
-1
drivers/dma/sf-pdma/sf-pdma.h
··· 78 78 u64 src_addr; 79 79 struct virt_dma_desc vdesc; 80 80 struct sf_pdma_chan *chan; 81 - bool in_use; 82 81 enum dma_transfer_direction dirn; 83 82 struct dma_async_tx_descriptor *async_tx; 84 83 };