[PATCH 3.8 57/86] ASoC: pcm: free path list before exiting from error conditions

[Kamal Mostafa]

On Tue, 2014-04-01 at 09:08 -0700, Kamal Mostafa wrote:
> 3.8.13.21 -stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Patrick Lai <plai at codeaurora.org>
> 
> commit e4ad1accb28d0ed8cea6f12395d58686ad344ca7 upstream.


I am dropping this patch from 3.8-stable, per Ben Hutchings' analysis in
stable@ thread "Re: [PATCH 3.13 110/149] ASoC: pcm: free path list
before exiting from error conditions".

Thanks, Ben!

 -Kamal


> dpcm_path_get() allocates dynamic memory to hold path list.
> Corresponding dpcm_path_put() must be called to free the memory.
> dpcm_path_put() is not called under several error conditions.
> This leads to memory leak.
> 
> Signed-off-by: Patrick Lai <plai at codeaurora.org>
> Signed-off-by: Mark Brown <broonie at linaro.org>
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>  sound/soc/soc-pcm.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
> index cf191e6..2d0dbd2 100644
> --- a/sound/soc/soc-pcm.c
> +++ b/sound/soc/soc-pcm.c
> @@ -1866,6 +1866,7 @@ int soc_dpcm_runtime_update(struct snd_soc_dapm_widget *widget)
>  
>  		paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);
>  		if (paths < 0) {
> +			dpcm_path_put(&list);
>  			dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
>  					fe->dai_link->name,  "playback");
>  			mutex_unlock(&card->mutex);
> @@ -1895,6 +1896,7 @@ capture:
>  
>  		paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);
>  		if (paths < 0) {
> +			dpcm_path_put(&list);
>  			dev_warn(fe->dev, "ASoC: %s no valid %s path\n",
>  					fe->dai_link->name,  "capture");
>  			mutex_unlock(&card->mutex);
> @@ -1959,6 +1961,7 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
>  	fe->dpcm[stream].runtime = fe_substream->runtime;
>  
>  	if (dpcm_path_get(fe, stream, &list) <= 0) {
> +		dpcm_path_put(&list);
>  		dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
>  			fe->dai_link->name, stream ? "capture" : "playback");
>  	}