Commit 29046a78 authored by Dinghao Liu's avatar Dinghao Liu Committed by Mark Brown

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: a792af69 ("ASoC: wm_adsp: Refactor compress stream initialisation")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231204074158.12026-1-dinghao.liu@zju.edu.cnSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5f44de69
...@@ -1451,12 +1451,12 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf) ...@@ -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, ret = wm_adsp_buffer_read(buf, caps->region_defs[i].base_offset,
&region->base_addr); &region->base_addr);
if (ret < 0) if (ret < 0)
return ret; goto err;
ret = wm_adsp_buffer_read(buf, caps->region_defs[i].size_offset, ret = wm_adsp_buffer_read(buf, caps->region_defs[i].size_offset,
&offset); &offset);
if (ret < 0) if (ret < 0)
return ret; goto err;
region->cumulative_size = offset; region->cumulative_size = offset;
...@@ -1467,6 +1467,10 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf) ...@@ -1467,6 +1467,10 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
} }
return 0; return 0;
err:
kfree(buf->regions);
return ret;
} }
static void wm_adsp_buffer_clear(struct wm_adsp_compr_buf *buf) static void wm_adsp_buffer_clear(struct wm_adsp_compr_buf *buf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment