From: Jonathan Cameron <jic23@kernel.org>
To: David Lechner <dlechner@baylibre.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: buffer-dmaengine: fix releasing dma channel on error
Date: Sat, 27 Jul 2024 14:55:30 +0100 [thread overview]
Message-ID: <20240727145530.51b72e6e@jic23-huawei> (raw)
In-Reply-To: <20240723-iio-fix-dmaengine-free-on-error-v1-1-2c7cbc9b92ff@baylibre.com>
On Tue, 23 Jul 2024 11:32:21 -0500
David Lechner <dlechner@baylibre.com> wrote:
> If dma_get_slave_caps() fails, we need to release the dma channel before
> returning an error to avoid leaking the channel.
>
> Fixes: 2d6ca60f3284 ("iio: Add a DMAengine framework based buffer")
> Signed-off-by: David Lechner <dlechner@baylibre.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
J
> ---
> drivers/iio/buffer/industrialio-buffer-dmaengine.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
> index 12aa1412dfa0..426cc614587a 100644
> --- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c
> +++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
> @@ -237,7 +237,7 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev,
>
> ret = dma_get_slave_caps(chan, &caps);
> if (ret < 0)
> - goto err_free;
> + goto err_release;
>
> /* Needs to be aligned to the maximum of the minimums */
> if (caps.src_addr_widths)
> @@ -263,6 +263,8 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev,
>
> return &dmaengine_buffer->queue.buffer;
>
> +err_release:
> + dma_release_channel(chan);
> err_free:
> kfree(dmaengine_buffer);
> return ERR_PTR(ret);
>
> ---
> base-commit: 472438c7e0e2261c6737a8321f46ef176eef1c8f
> change-id: 20240723-iio-fix-dmaengine-free-on-error-6e6e8b4dd058
prev parent reply other threads:[~2024-07-27 13:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 16:32 [PATCH] iio: buffer-dmaengine: fix releasing dma channel on error David Lechner
2024-07-27 13:55 ` Jonathan Cameron [this message]
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=20240727145530.51b72e6e@jic23-huawei \
--to=jic23@kernel.org \
--cc=dlechner@baylibre.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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