From: Colin King <colin.king@canonical.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>, Vinod Koul <vinod.koul@intel.com>,
Dharageswari R <dharageswari.r@intel.com>,
Senthilnathan Veppur <senthilnathanx.veppur@intel.com>,
Shreyas NC <shreyas.nc@intel.com>,
Ramesh Babu <ramesh.babu@intel.com>,
alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] ASoC: Intel: Skylake: fix memory leak of module on error exit path
Date: Thu, 29 Sep 2016 18:32:12 +0100 [thread overview]
Message-ID: <20160929173212.13700-1-colin.king@canonical.com> (raw)
From: Colin Ian King <colin.king@canonical.com>
Currently there is a memory leak of module on a ENOMEM return path.
Fix this by kfree'ing module before returning.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
sound/soc/intel/skylake/skl-sst-utils.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c
index d3120ba..8dc0303 100644
--- a/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@ -354,8 +354,10 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,
module->max_instance = mod_entry->instance_max_count;
size = sizeof(int) * mod_entry->instance_max_count;
module->instance_id = devm_kzalloc(ctx->dev, size, GFP_KERNEL);
- if (!module->instance_id)
+ if (!module->instance_id) {
+ kfree(module);
return -ENOMEM;
+ }
list_add_tail(&module->list, &skl->uuid_list);
--
2.9.3
next reply other threads:[~2016-09-29 17:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-29 17:32 Colin King [this message]
2016-09-29 18:32 ` Applied "ASoC: Intel: Skylake: fix memory leak of module on error exit path" 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=20160929173212.13700-1-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=dharageswari.r@intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=ramesh.babu@intel.com \
--cc=senthilnathanx.veppur@intel.com \
--cc=shreyas.nc@intel.com \
--cc=tiwai@suse.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).