diff options
| author | Subhransu S. Prusty | 2016-02-17 17:03:59 +0100 |
|---|---|---|
| committer | Mark Brown | 2016-02-19 16:56:53 +0100 |
| commit | 6793a3d70676c6f3d2ec0ce4e1e241617541702c (patch) | |
| tree | eb9d4feb9c90fef1cda112fe65adf8f2b7a6c4b5 /sound/soc/codecs | |
| parent | ASoC: hdac_hdmi: Remove 'edev' NULL check (diff) | |
| download | kernel-qcow2-linux-6793a3d70676c6f3d2ec0ce4e1e241617541702c.tar.gz kernel-qcow2-linux-6793a3d70676c6f3d2ec0ce4e1e241617541702c.tar.xz kernel-qcow2-linux-6793a3d70676c6f3d2ec0ce4e1e241617541702c.zip | |
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: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/hdac_hdmi.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 2884dbf0bc07..d2a2e1882fdd 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -405,9 +405,13 @@ static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream, return -ENODEV; } - dd = kzalloc(sizeof(*dd), GFP_KERNEL); - if (!dd) - return -ENOMEM; + 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); - kfree(dd); + if (dd) { + snd_soc_dai_set_dma_data(dai, substream, NULL); + kfree(dd); + } return 0; } |