Commit 4713be84 authored Dec 04, 2023 by Dinghao Liu Committed by Greg Kroah-Hartman Dec 13, 2023

ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate



[ Upstream commit 29046a78a3c0a1f8fa0427f164caa222f003cf5b ]

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: a792af69 ("ASoC: wm_adsp: Refactor compress stream initialisation")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231204074158.12026-1-dinghao.liu@zju.edu.cn


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent febb7bbe

sound/soc/codecs/wm_adsp.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -3649,12 +3649,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;

		@@ -3665,6 +3665,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)