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

[Richard Fitzgerald]

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 <dinghao.liu@xxxxxxxxxx>
> ---
>   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 <rf@xxxxxxxxxxxxxxxxxxxxx>