From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org,
"Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>,
"Ranjani Sridharan" <ranjani.sridharan@linux.intel.com>
Subject: [PATCH v2 1/6] ASoC: topology: Add missing memory checks
Date: Fri, 27 Mar 2020 16:47:24 -0400 [thread overview]
Message-ID: <20200327204729.397-2-amadeuszx.slawinski@linux.intel.com> (raw)
In-Reply-To: <20200327204729.397-1-amadeuszx.slawinski@linux.intel.com>
kstrdup is an allocation function and it can fail, so its return value
should be checked and handled appropriately.
In order to check all cases, we need to modify set_stream_info to return
a value, so check that everything went correctly when doing kstrdup().
Later add proper checks and error handlers.
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
v2:
Remove unneeded freeing, which is performed in another place by dobj
handlers.
sound/soc/soc-topology.c | 62 +++++++++++++++++++++++++++++++---------
1 file changed, 49 insertions(+), 13 deletions(-)
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 1f81cd2d29cf..434e152ac8ee 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1766,10 +1766,13 @@ static int soc_tplg_dapm_complete(struct soc_tplg *tplg)
return 0;
}
-static void set_stream_info(struct snd_soc_pcm_stream *stream,
+static int set_stream_info(struct snd_soc_pcm_stream *stream,
struct snd_soc_tplg_stream_caps *caps)
{
stream->stream_name = kstrdup(caps->name, GFP_KERNEL);
+ if (!stream->stream_name)
+ return -ENOMEM;
+
stream->channels_min = le32_to_cpu(caps->channels_min);
stream->channels_max = le32_to_cpu(caps->channels_max);
stream->rates = le32_to_cpu(caps->rates);
@@ -1777,6 +1780,8 @@ static void set_stream_info(struct snd_soc_pcm_stream *stream,
stream->rate_max = le32_to_cpu(caps->rate_max);
stream->formats = le64_to_cpu(caps->formats);
stream->sig_bits = le32_to_cpu(caps->sig_bits);
+
+ return 0;
}
static void set_dai_flags(struct snd_soc_dai_driver *dai_drv,
@@ -1812,20 +1817,29 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
if (dai_drv == NULL)
return -ENOMEM;
- if (strlen(pcm->dai_name))
+ if (strlen(pcm->dai_name)) {
dai_drv->name = kstrdup(pcm->dai_name, GFP_KERNEL);
+ if (!dai_drv->name) {
+ ret = -ENOMEM;
+ goto err;
+ }
+ }
dai_drv->id = le32_to_cpu(pcm->dai_id);
if (pcm->playback) {
stream = &dai_drv->playback;
caps = &pcm->caps[SND_SOC_TPLG_STREAM_PLAYBACK];
- set_stream_info(stream, caps);
+ ret = set_stream_info(stream, caps);
+ if (ret < 0)
+ goto err;
}
if (pcm->capture) {
stream = &dai_drv->capture;
caps = &pcm->caps[SND_SOC_TPLG_STREAM_CAPTURE];
- set_stream_info(stream, caps);
+ ret = set_stream_info(stream, caps);
+ if (ret < 0)
+ goto err;
}
if (pcm->compress)
@@ -1835,11 +1849,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL);
if (ret < 0) {
dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n");
- kfree(dai_drv->playback.stream_name);
- kfree(dai_drv->capture.stream_name);
- kfree(dai_drv->name);
- kfree(dai_drv);
- return ret;
+ goto err;
}
dai_drv->dobj.index = tplg->index;
@@ -1860,6 +1870,14 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
return ret;
}
+ return 0;
+
+err:
+ kfree(dai_drv->playback.stream_name);
+ kfree(dai_drv->capture.stream_name);
+ kfree(dai_drv->name);
+ kfree(dai_drv);
+
return ret;
}
@@ -1916,11 +1934,20 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
if (strlen(pcm->pcm_name)) {
link->name = kstrdup(pcm->pcm_name, GFP_KERNEL);
link->stream_name = kstrdup(pcm->pcm_name, GFP_KERNEL);
+ if (!link->name || !link->stream_name) {
+ ret = -ENOMEM;
+ goto err;
+ }
}
link->id = le32_to_cpu(pcm->pcm_id);
- if (strlen(pcm->dai_name))
+ if (strlen(pcm->dai_name)) {
link->cpus->dai_name = kstrdup(pcm->dai_name, GFP_KERNEL);
+ if (!link->cpus->dai_name) {
+ ret = -ENOMEM;
+ goto err;
+ }
+ }
link->codecs->name = "snd-soc-dummy";
link->codecs->dai_name = "snd-soc-dummy-dai";
@@ -2436,13 +2463,17 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg,
if (d->playback) {
stream = &dai_drv->playback;
caps = &d->caps[SND_SOC_TPLG_STREAM_PLAYBACK];
- set_stream_info(stream, caps);
+ ret = set_stream_info(stream, caps);
+ if (ret < 0)
+ goto err;
}
if (d->capture) {
stream = &dai_drv->capture;
caps = &d->caps[SND_SOC_TPLG_STREAM_CAPTURE];
- set_stream_info(stream, caps);
+ ret = set_stream_info(stream, caps);
+ if (ret < 0)
+ goto err;
}
if (d->flag_mask)
@@ -2454,10 +2485,15 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg,
ret = soc_tplg_dai_load(tplg, dai_drv, NULL, dai);
if (ret < 0) {
dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n");
- return ret;
+ goto err;
}
return 0;
+
+err:
+ kfree(dai_drv->playback.stream_name);
+ kfree(dai_drv->capture.stream_name);
+ return ret;
}
/* load physical DAI elements */
--
2.17.1
next prev parent reply other threads:[~2020-03-27 18:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 20:47 [PATCH v2 0/6] ASoC: topology: Propagate error appropriately Amadeusz Sławiński
2020-03-27 20:47 ` Amadeusz Sławiński [this message]
2020-04-09 12:02 ` Applied "ASoC: topology: Add missing memory checks" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 2/6] ASoC: topology: Check return value of soc_tplg_create_tlv Amadeusz Sławiński
2020-04-09 12:02 ` Applied "ASoC: topology: Check return value of soc_tplg_create_tlv" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 3/6] ASoC: topology: Check return value of soc_tplg_*_create Amadeusz Sławiński
2020-03-27 18:56 ` Pierre-Louis Bossart
2020-03-30 8:12 ` Amadeusz Sławiński
2020-03-30 15:51 ` Pierre-Louis Bossart
2020-03-30 16:10 ` Amadeusz Sławiński
2020-03-30 16:36 ` Pierre-Louis Bossart
2020-04-09 12:02 ` Applied "ASoC: topology: Check return value of soc_tplg_*_create" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 4/6] ASoC: topology: Check soc_tplg_add_route return value Amadeusz Sławiński
2020-04-09 12:02 ` Applied "ASoC: topology: Check soc_tplg_add_route return value" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 5/6] ASoC: topology: Check return value of pcm_new_ver Amadeusz Sławiński
2020-04-09 12:02 ` Applied "ASoC: topology: Check return value of pcm_new_ver" to the asoc tree Mark Brown
2020-03-27 20:47 ` [PATCH v2 6/6] ASoC: topology: Check return value of soc_tplg_dai_config Amadeusz Sławiński
2020-04-09 12:02 ` Applied "ASoC: topology: Check return value of soc_tplg_dai_config" to the asoc tree Mark Brown
2020-03-30 16:38 ` [PATCH v2 0/6] ASoC: topology: Propagate error appropriately Pierre-Louis Bossart
2020-04-08 8:51 ` Amadeusz Sławiński
2020-04-08 14:20 ` Pierre-Louis Bossart
2020-04-08 14:46 ` Amadeusz Sławiński
2020-04-08 16:52 ` Ranjani Sridharan
2020-03-30 16:41 ` Sridharan, Ranjani
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=20200327204729.397-2-amadeuszx.slawinski@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.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).