Unverified Commit 07b542fe authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: codecs: rt*-sdw: fix memory leak in set_sdw_stream() 



Now that the sdw_stream is allocated in machine driver,
set_sdw_stream() is also called with a NULL argument during the
dailink shutdown.

In this case, the drivers should not allocate any memory, and just
return.

Detected with KASAN/kmemleak.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Cc: Oder Chiou <oder_chiou@realtek.com>
Cc: Shuming Fan <shumingf@realtek.com>
Cc: Jack Yu <jack.yu@realtek.com>
Link: https://lore.kernel.org/r/20200515211531.11416-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b5dff6ec

sound/soc/codecs/rt1308-sdw.c

+3 −0
Original line number Diff line number Diff line
@@ -482,6 +482,9 @@ static int rt1308_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



	stream = kzalloc(sizeof(*stream), GFP_KERNEL);

	if (!stream)

		return -ENOMEM;

sound/soc/codecs/rt5682.c

+3 −0
Original line number Diff line number Diff line
@@ -2935,6 +2935,9 @@ static int rt5682_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



	stream = kzalloc(sizeof(*stream), GFP_KERNEL);

	if (!stream)

		return -ENOMEM;

sound/soc/codecs/rt700.c

+3 −0
Original line number Diff line number Diff line
@@ -860,6 +860,9 @@ static int rt700_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



	stream = kzalloc(sizeof(*stream), GFP_KERNEL);

	if (!stream)

		return -ENOMEM;

sound/soc/codecs/rt711.c

+3 −0
Original line number Diff line number Diff line
@@ -906,6 +906,9 @@ static int rt711_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



	stream = kzalloc(sizeof(*stream), GFP_KERNEL);

	if (!stream)

		return -ENOMEM;

sound/soc/codecs/rt715.c

+3 −0
Original line number Diff line number Diff line
@@ -530,6 +530,9 @@ static int rt715_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 


	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



	stream = kzalloc(sizeof(*stream), GFP_KERNEL);

	if (!stream)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE