2023-12-04 07:43:21

by Dinghao Liu

Subject: [PATCH] ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate

When wm_adsp_buffer_read() fails, we should free buf->regions.
Otherwise, the callers of wm_adsp_buffer_populate() will
directly free buf on failure, which makes buf->regions a leaked
memory.

Fixes: a792af69b08f ("ASoC: wm_adsp: Refactor compress stream initialisation")
Signed-off-by: Dinghao Liu <[email protected]>
---
sound/soc/codecs/wm_adsp.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 236b12b69ae5..c01e31175015 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1451,12 +1451,12 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
ret = wm_adsp_buffer_read(buf, caps->region_defs[i].base_offset,
&region->base_addr);
if (ret < 0)
- return ret;
+ goto err;

ret = wm_adsp_buffer_read(buf, caps->region_defs[i].size_offset,
&offset);
if (ret < 0)
- return ret;
+ goto err;

region->cumulative_size = offset;

@@ -1467,6 +1467,10 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
}

return 0;
+
+err:
+ kfree(buf->regions);
+ return ret;
}

static void wm_adsp_buffer_clear(struct wm_adsp_compr_buf *buf)
--
2.17.1

2023-12-04 10:27:44

by Richard Fitzgerald

Subject: Re: [PATCH] ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate

On 04/12/2023 07:41, Dinghao Liu wrote:
> When wm_adsp_buffer_read() fails, we should free buf->regions.
> Otherwise, the callers of wm_adsp_buffer_populate() will
> directly free buf on failure, which makes buf->regions a leaked
> memory.
>
> Fixes: a792af69b08f ("ASoC: wm_adsp: Refactor compress stream initialisation")
> Signed-off-by: Dinghao Liu <[email protected]>
> ---
> sound/soc/codecs/wm_adsp.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
> index 236b12b69ae5..c01e31175015 100644
> --- a/sound/soc/codecs/wm_adsp.c
> +++ b/sound/soc/codecs/wm_adsp.c
> @@ -1451,12 +1451,12 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
> ret = wm_adsp_buffer_read(buf, caps->region_defs[i].base_offset,
> &region->base_addr);
> if (ret < 0)
> - return ret;
> + goto err;
>
> ret = wm_adsp_buffer_read(buf, caps->region_defs[i].size_offset,
> &offset);
> if (ret < 0)
> - return ret;
> + goto err;
>
> region->cumulative_size = offset;
>
> @@ -1467,6 +1467,10 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
> }
>
> return 0;
> +
> +err:
> + kfree(buf->regions);
> + return ret;
> }
>
> static void wm_adsp_buffer_clear(struct wm_adsp_compr_buf *buf)

Reviewed-by: Richard Fitzgerald <[email protected]>

2023-12-04 16:29:43

by Mark Brown

Subject: Re: [PATCH] ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate

On Mon, 04 Dec 2023 15:41:56 +0800, Dinghao Liu wrote:
> When wm_adsp_buffer_read() fails, we should free buf->regions.
> Otherwise, the callers of wm_adsp_buffer_populate() will
> directly free buf on failure, which makes buf->regions a leaked
> memory.
>
>

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate
commit: 29046a78a3c0a1f8fa0427f164caa222f003cf5b

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark