sound/soc: imx: check kzalloc() result and fix memory leak

PATCH Applied Kulikov Vasiliy 1 participant 1 message Jul 16, 2010

Subsystems (4)

Sound Arm i.MX and Layerscape Kernel janitors ASoC

lore

Share & tools

lore

Kulikov Vasiliy

author

2010-07-16 16:16 UTC #0 lore raw

PATCH 14/15 sound/soc: 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 <[email protected]>

---
 sound/soc/imx/imx-pcm-dma-mx2.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

sound/soc/imx/imx-pcm-dma-mx2.c +5 -1

index 05f19c9..0a595da 100644
@@ -292,12 +292,16 @@ static int snd_imx_open(struct snd_pcm_substream *substream)
 	int ret;
 
 	iprtd = kzalloc(sizeof(*iprtd), GFP_KERNEL);
+	if (iprtd == NULL)
+		return -ENOMEM;
 	runtime->private_data = iprtd;
 
 	ret = snd_pcm_hw_constraint_integer(substream->runtime,
 			SNDRV_PCM_HW_PARAM_PERIODS);
-	if (ret < 0)
+	if (ret < 0) {
+		kfree(iprtd);
 		return ret;
+	}
 
 	snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware);
 	return 0;

Signature · 1 line

1.7.0.4