Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Message-ID: <a69e24fe-a4e6-4ae0-b27b-4d5c1f18e78a@opensource.cirrus.com>
Date:   Mon, 4 Dec 2023 10:26:01 +0000
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate
To:     Dinghao Liu <dinghao.liu@zju.edu.cn>
CC:     Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>,
        Jaroslav Kysela <perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>,
        "Simon Trimmer" <simont@opensource.cirrus.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
        Claudiu Beznea <claudiu.beznea@tuxon.dev>,
        Charles Keepax <ckeepax@opensource.cirrus.com>,
        <patches@opensource.cirrus.com>, <linux-sound@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
References: <20231204074158.12026-1-dinghao.liu@zju.edu.cn>
Content-Language: en-US
From:   Richard Fitzgerald <rf@opensource.cirrus.com>
In-Reply-To: <20231204074158.12026-1-dinghao.liu@zju.edu.cn>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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@zju.edu.cn>
> ---
>   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@opensource.cirrus.com>