Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f46eec97 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman
Browse files

ASoC: intel: Fix memleak in sst_media_open 



[ Upstream commit 062fa09f44f4fb3776a23184d5d296b0c8872eb9 ]

When power_up_sst() fails, stream needs to be freed
just like when try_module_get() fails. However, current
code is returning directly and ends up leaking memory.

Fixes: 0121327c ("ASoC: Intel: mfld-pcm: add control for powering up/down dsp")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200813084112.26205-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3f9f6b03

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+3 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, 


	ret_val = power_up_sst(stream);

	if (ret_val < 0)

		return ret_val;

		goto out_power_up;



	/* Make sure, that the period size is always even */

	snd_pcm_hw_constraint_step(substream->runtime, 0,
@@ -348,8 +348,9 @@ static int sst_media_open(struct snd_pcm_substream *substream, 
	return snd_pcm_hw_constraint_integer(runtime,

			 SNDRV_PCM_HW_PARAM_PERIODS);

out_ops:

	kfree(stream);

	mutex_unlock(&sst_lock);

out_power_up:

	kfree(stream);

	return ret_val;

}