diff options
author | Kulikov Vasiliy <segooon@gmail.com> | 2010-07-16 12:16:54 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-17 14:45:56 -0400 |
commit | 50e8ce14698273d3c493b2e66f323f6b18eac099 (patch) | |
tree | 9d55a58490c8cf585421e05705e6c54315c77dc8 /sound | |
parent | 51b6dfb627d785ee92c2bd1e159e2de47cdc29c3 (diff) |
ASoC: imx: check kzalloc() result and fix memory leak
If kzalloc() fails we must exit with -ENOMEM. Also we must free
allocated runtime->private_data on error as it would be lost on next
call to snd_imx_open().
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/imx/imx-pcm-fiq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c index 6b518e07eea9..b2bf27282cd2 100644 --- a/sound/soc/imx/imx-pcm-fiq.c +++ b/sound/soc/imx/imx-pcm-fiq.c | |||
@@ -192,6 +192,8 @@ static int snd_imx_open(struct snd_pcm_substream *substream) | |||
192 | int ret; | 192 | int ret; |
193 | 193 | ||
194 | iprtd = kzalloc(sizeof(*iprtd), GFP_KERNEL); | 194 | iprtd = kzalloc(sizeof(*iprtd), GFP_KERNEL); |
195 | if (iprtd == NULL) | ||
196 | return -ENOMEM; | ||
195 | runtime->private_data = iprtd; | 197 | runtime->private_data = iprtd; |
196 | 198 | ||
197 | iprtd->substream = substream; | 199 | iprtd->substream = substream; |
@@ -202,8 +204,10 @@ static int snd_imx_open(struct snd_pcm_substream *substream) | |||
202 | 204 | ||
203 | ret = snd_pcm_hw_constraint_integer(substream->runtime, | 205 | ret = snd_pcm_hw_constraint_integer(substream->runtime, |
204 | SNDRV_PCM_HW_PARAM_PERIODS); | 206 | SNDRV_PCM_HW_PARAM_PERIODS); |
205 | if (ret < 0) | 207 | if (ret < 0) { |
208 | kfree(iprtd); | ||
206 | return ret; | 209 | return ret; |
210 | } | ||
207 | 211 | ||
208 | snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware); | 212 | snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware); |
209 | return 0; | 213 | return 0; |