Skip to content

dmaengine: adi-dma: fix use-after-free in cyclic transfers #3112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pamolloy wants to merge 1 commit into
base: adsp-6.12.0-y
Choose a base branch
from
+3 −1
Open

dmaengine: adi-dma: fix use-after-free in cyclic transfers #3112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/dma/adi-dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@

channel->current_desc = desc;

dev_dbg(dma->dev, "dma config: src = 0x%llx, dst = 0x%llx\n", desc->src, desc->dest);

Check warning on line 501 in drivers/dma/adi-dma.c

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build 

gcc_fanalayzer: format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type 'dma_addr_t' {aka 'unsigned int'} [-Wformat=]
501 | dev_dbg(dma->dev, "dma config: src = 0x%llx, dst = 0x%llx\n", desc->src, desc->dest);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 501 in drivers/dma/adi-dma.c

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build 

gcc_fanalayzer: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'dma_addr_t' {aka 'unsigned int'} [-Wformat=]
501 | dev_dbg(dma->dev, "dma config: src = 0x%llx, dst = 0x%llx\n", desc->src, desc->dest);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 501 in drivers/dma/adi-dma.c

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build 

kernel_sparse: format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type 'dma_addr_t' {aka 'unsigned int'} [-Wformat=]
 501 | dev_dbg(dma->dev, "dma config: src = 0x%llx, dst = 0x%llx\n", desc->src, desc->dest);
 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 501 in drivers/dma/adi-dma.c

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build 

kernel_sparse: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'dma_addr_t' {aka 'unsigned int'} [-Wformat=]
 501 | dev_dbg(dma->dev, "dma config: src = 0x%llx, dst = 0x%llx\n", desc->src, desc->dest);
 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

dev_dbg(dma->dev, " xcount = %d, xmod = %d, cfg = 0x%x\n",
desc->xcnt, desc->xmod, desc->cfg);
Expand Down Expand Up @@ -896,10 +896,12 @@
spin_lock_irqsave(&channel->lock, flags);

if (channel->current_desc && channel->current_desc->cyclic) {
struct dmaengine_result result = channel->current_desc->result;

dmaengine_desc_get_callback(&channel->current_desc->tx, &cb);

spin_unlock_irqrestore(&channel->lock, flags);
dmaengine_desc_callback_invoke(&cb, &channel->current_desc->result);
dmaengine_desc_callback_invoke(&cb, &result);
return IRQ_HANDLED;
}

Expand Down
Loading