public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Antonio Borneo <borneo.antonio@gmail.com>
To: dmaengine@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>,
	Dan Williams <dan.j.williams@intel.com>
Cc: Antonio Borneo <borneo.antonio@gmail.com>,
	linux-kernel@vger.kernel.org,
	John Stultz <john.stultz@linaro.org>,
	Zhangfei Gao <zhangfei.gao@linaro.org>
Subject: [PATCH v2 2/3] dmaengine: k3dma: fix double free of descriptor
Date: Tue,  1 Aug 2017 22:09:26 +0200	[thread overview]
Message-ID: <20170801200928.24661-3-borneo.antonio@gmail.com> (raw)
In-Reply-To: <20170801200928.24661-1-borneo.antonio@gmail.com>
In-Reply-To: <CAAj6DX3=bQDf=2c=L-jM0wwXGOmM7Lq+m7t73Zpjf8mgsk5bNg@mail.gmail.com>

Commit 36387a2b1f62b5c087c5fe6f0f7b23b94f722ad7 ("k3dma: Fix
memory handling in preparation for cyclic mode") adds code
to free the descriptor in ds_done.

In cyclic mode, ds_done is never used and it's always NULL,
so the added code is not executed.

In non-cyclic mode, ds_done is used as a flag: when not NULL
it signals that the descriptor has been consumed. No need to
free it because it would be free by vchan_complete().

The fix takes back the code changed by the commit above:
- remove the free on the descriptor;
- initialize ds_done to NULL for the next run.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
---
To: dmaengine@vger.kernel.org
To: Vinod Koul <vinod.koul@intel.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: linux-kernel@vger.kernel.org
Cc: John Stultz <john.stultz@linaro.org>
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
---
 drivers/dma/k3dma.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index c00eb12..b769623 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -724,11 +724,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan)
 			k3_dma_free_desc(&p->ds_run->vd);
 			p->ds_run = NULL;
 		}
-		if (p->ds_done) {
-			k3_dma_free_desc(&p->ds_done->vd);
-			p->ds_done = NULL;
-		}
-
+		p->ds_done = NULL;
 	}
 	spin_unlock_irqrestore(&c->vc.lock, flags);
 	vchan_dma_desc_free_list(&c->vc, &head);
-- 
1.9.1

  parent reply	other threads:[~2017-08-01 20:10 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-10 20:53 [PATCH] dma: k3dma: Fix non-cyclic mode John Stultz
2017-07-11  1:16 ` zhangfei
2017-07-18 15:58 ` Vinod Koul
2017-07-18 22:29   ` Antonio Borneo
2017-07-19  3:47     ` Vinod Koul
2017-07-19  6:00       ` Antonio Borneo
2017-08-01 20:09         ` [PATCH v2 0/3] dmaengine: " Antonio Borneo
2017-08-25  6:46           ` Vinod Koul
2017-08-01 20:09         ` [PATCH v2 1/3] dmaengine: k3dma: fix " Antonio Borneo
2017-08-01 20:09         ` Antonio Borneo [this message]
2017-08-01 20:09         ` [PATCH v2 3/3] dmaengine: k3dma: remove useless ON_WARN_ONCE() Antonio Borneo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170801200928.24661-3-borneo.antonio@gmail.com \
    --to=borneo.antonio@gmail.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vinod.koul@intel.com \
    --cc=zhangfei.gao@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox