diff options
| author | Martin Povišer | 2023-02-24 16:22:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2023-04-20 12:35:08 +0200 |
| commit | b7abd535881a48587961c2099b1d2933ebd42c4b (patch) | |
| tree | 584c72a1982ffbc3bc4bce6aa523f0fe2e27d4c4 /drivers/dma | |
| parent | fdbd0392352c3defc74e58795eb0e8b61907f413 (diff) | |
dmaengine: apple-admac: Fix 'current_tx' not getting freed
[ Upstream commit d9503be5a100c553731c0e8a82c7b4201e8a970c ]
In terminate_all we should queue up all submitted descriptors to be
freed. We do that for the content of the 'issued' and 'submitted' lists,
but the 'current_tx' descriptor falls through the cracks as it's
removed from the 'issued' list once it gets assigned to be the current
descriptor. Explicitly queue up freeing of the 'current_tx' descriptor
to address a memory leak that is otherwise present.
Fixes: b127315d9a78 ("dmaengine: apple-admac: Add Apple ADMAC driver")
Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20230224152222.26732-2-povik+lin@cutebit.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/apple-admac.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index b9132b495d18..4cf8da77bdd9 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -512,7 +512,10 @@ static int admac_terminate_all(struct dma_chan *chan) admac_stop_chan(adchan); admac_reset_rings(adchan); - adchan->current_tx = NULL; + if (adchan->current_tx) { + list_add_tail(&adchan->current_tx->node, &adchan->to_free); + adchan->current_tx = NULL; + } /* * Descriptors can only be freed after the tasklet * has been killed (in admac_synchronize). |