8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
From a1be7936af049dfc0d6f63e82f6faeda8fbf9746 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 20 Mar 2025 16:40:02 +0000
|
|
Subject: [PATCH] dmaengine: dw-axi-dmac: Improve axi_desc_put
|
|
|
|
axi_desc_put often gets called in error paths, and so can't assume that
|
|
the descriptor passed in has been completely initialised. Guard against
|
|
unallocated LLIs.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/6733
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
@@ -367,7 +367,8 @@ static void axi_desc_put(struct axi_dma_
|
|
|
|
for (descs_put = 0; descs_put < count; descs_put++) {
|
|
hw_desc = &desc->hw_desc[descs_put];
|
|
- dma_pool_free(chan->desc_pool, hw_desc->lli, hw_desc->llp);
|
|
+ if (hw_desc->lli)
|
|
+ dma_pool_free(chan->desc_pool, hw_desc->lli, hw_desc->llp);
|
|
}
|
|
|
|
kfree(desc->hw_desc);
|