Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0edd1eac authored by David Lechner's avatar David Lechner Committed by Greg Kroah-Hartman
Browse files

iio: buffer-dmaengine: fix releasing dma channel on error 



commit 84c65d8008764a8fb4e627ff02de01ec4245f2c4 upstream.

If dma_get_slave_caps() fails, we need to release the dma channel before
returning an error to avoid leaking the channel.

Fixes: 2d6ca60f ("iio: Add a DMAengine framework based buffer")
Signed-off-by: default avatarDavid Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20240723-iio-fix-dmaengine-free-on-error-v1-1-2c7cbc9b92ff@baylibre.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cff08d63

drivers/iio/buffer/industrialio-buffer-dmaengine.c

+3 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 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)
@@ -184,6 +184,8 @@ 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);