Commit fd2c4b11 authored May 09, 2014 by Gopikrishnaiah Anandan

ASoC: pcm: Remove double free in case of error condition



If dpcm_fe_dai_open doesn't find a valid path,memory allocated for list
of dapm widgets is being freed.List is accessed in function after
freeing and it is being freed at the end.
This change will ensure that list is freed at the end to
prevent double free and any invalid access in case of error conditions.

CRs-fixed: 663092
Change-Id: I1c345459d8ba6f4b8e2d2545b298ea3c0c1797a2
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>

parent 2f04273d

sound/soc/soc-pcm.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2003,11 +2003,9 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
		mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
		fe->dpcm[stream].runtime = fe_substream->runtime;

		if (dpcm_path_get(fe, stream, &list) <= 0) {
		dpcm_path_put(&list);
		if (dpcm_path_get(fe, stream, &list) <= 0)
		dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",
		fe->dai_link->name, stream ? "capture" : "playback");
		}

		/* calculate valid and active FE <-> BE dpcms */
		dpcm_process_paths(fe, stream, &list, 1);