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

Commit 6793a3d7 authored by Subhransu S. Prusty's avatar Subhransu S. Prusty Committed by Mark Brown
Browse files

ASoC: hdac_hdmi: Fix possible memory leak in hw_params 



It's possible for hw_params to be called two times. So add NULL
check to prevent memory leak.

Signed-off-by: default avatarSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cd890ade

sound/soc/codecs/hdac_hdmi.c

+11 −5
Original line number Diff line number Diff line
@@ -405,9 +405,13 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream, 
		return -ENODEV;

	}



	dd = snd_soc_dai_get_dma_data(dai, substream);

	if (!dd) {

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

		if (!dd)

			return -ENOMEM;

	}



	dd->format = snd_hdac_calc_stream_format(params_rate(hparams),

			params_channels(hparams), params_format(hparams),

			24, 0);
@@ -433,9 +437,11 @@ static int hdac_hdmi_playback_cleanup(struct snd_pcm_substream *substream, 
				AC_VERB_SET_STREAM_FORMAT, 0);



	dd = (struct hdac_ext_dma_params *)snd_soc_dai_get_dma_data(dai, substream);

	snd_soc_dai_set_dma_data(dai, substream, NULL);



	if (dd) {

		snd_soc_dai_set_dma_data(dai, substream, NULL);

		kfree(dd);

	}



	return 0;

}