All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, lgirdwood@gmail.com, patches.audio@intel.com,
	broonie@kernel.org, Vinod Koul <vinod.koul@intel.com>,
	"Subhransu S. Prusty" <subhransu.s.prusty@intel.com>
Subject: [PATCH v7 1/9] ASoC: hdac_hdmi: Fix possible memory leak in hw_params
Date: Wed, 17 Feb 2016 21:33:59 +0530	[thread overview]
Message-ID: <1455725047-7303-2-git-send-email-subhransu.s.prusty@intel.com> (raw)
In-Reply-To: <1455725047-7303-1-git-send-email-subhransu.s.prusty@intel.com>

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>
---
 sound/soc/codecs/hdac_hdmi.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 2884dbf..d2a2e18 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;
 }
-- 
1.9.1

  reply	other threads:[~2016-02-17 16:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17 16:03 [PATCH v7 0/9] ASoC: hdac_hdmi: Update to HDMI driver Subhransu S. Prusty
2016-02-17 16:03 ` Subhransu S. Prusty [this message]
2016-02-20 17:15   ` Applied "ASoC: hdac_hdmi: Fix possible memory leak in hw_params" to the asoc tree Mark Brown
2016-02-17 16:04 ` [PATCH v7 2/9] ASoC: hdac_hdmi: Don't fail in dai startup to make userland happy Subhransu S. Prusty
2016-02-20 17:15   ` Applied "ASoC: hdac_hdmi: Don't fail in dai startup to make userland happy" to the asoc tree Mark Brown
2016-02-17 16:04 ` [PATCH v7 3/9] ASoC: hdac_hdmi: Fix to keep codec power active during enumeration Subhransu S. Prusty
2016-02-17 16:04 ` [PATCH v7 4/9] ASoC: hdac_hdmi: Fix to reconfigure registers in runtime resume Subhransu S. Prusty
2016-02-19 15:55   ` Mark Brown
2016-02-17 16:04 ` [PATCH v7 5/9] ASoC: hdac_hdmi: Fix to wait for D3 before powering off codec Subhransu S. Prusty
2016-02-19 15:56   ` Mark Brown
2016-02-17 16:04 ` [PATCH v7 6/9] ASoC: hdac_hdmi: Add PM support Subhransu S. Prusty
2016-02-17 16:04 ` [PATCH v7 7/9] ASoC: Intel: Skylake: Fix possible memory corruption in codec dai dma params Subhransu S. Prusty
2016-02-20 17:15   ` Applied "ASoC: Intel: Skylake: Fix possible memory corruption in codec dai dma params" to the asoc tree Mark Brown
2016-02-17 16:04 ` [PATCH v7 8/9] ASoC: Intel: Skylake: Add i915 enabling in skl probe Subhransu S. Prusty
2016-02-20 17:15   ` Applied "ASoC: Intel: Skylake: Add i915 enabling in skl probe" to the asoc tree Mark Brown
2016-02-17 16:04 ` [PATCH v7 9/9] ASoC: Intel: Skylake: Add HDMI FE and BE cpu dais Subhransu S. Prusty
2016-02-20 17:15   ` Applied "ASoC: Intel: Skylake: Add HDMI FE and BE cpu dais" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455725047-7303-2-git-send-email-subhransu.s.prusty@intel.com \
    --to=subhransu.s.prusty@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=patches.audio@intel.com \
    --cc=tiwai@suse.de \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.