From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH v2 5/6] ASoC: topology: Check widget kcontrols before deref.
Date: Tue, 27 Mar 2018 14:30:44 +0100 [thread overview]
Message-ID: <20180327133045.29351-6-liam.r.girdwood@linux.intel.com> (raw)
In-Reply-To: <20180327133045.29351-1-liam.r.girdwood@linux.intel.com>
Validate the topology input before we dereference the pointer.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
sound/soc/soc-topology.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index b1970a05ba44..b578bc938118 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -517,7 +517,7 @@ static void remove_widget(struct snd_soc_component *comp,
*/
if (dobj->widget.kcontrol_type == SND_SOC_TPLG_TYPE_ENUM) {
/* enumerated widget mixer */
- for (i = 0; i < w->num_kcontrols; i++) {
+ for (i = 0; w->kcontrols != NULL && i < w->num_kcontrols; i++) {
struct snd_kcontrol *kcontrol = w->kcontrols[i];
struct soc_enum *se =
(struct soc_enum *)kcontrol->private_value;
@@ -534,7 +534,7 @@ static void remove_widget(struct snd_soc_component *comp,
}
} else {
/* volume mixer or bytes controls */
- for (i = 0; i < w->num_kcontrols; i++) {
+ for (i = 0; w->kcontrols != NULL && i < w->num_kcontrols; i++) {
struct snd_kcontrol *kcontrol = w->kcontrols[i];
if (dobj->widget.kcontrol_type
--
2.14.1
next prev parent reply other threads:[~2018-03-27 13:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 13:30 [PATCH v2 0/6] ASoC: SOF driver dependencies Liam Girdwood
2018-03-27 13:30 ` [PATCH v2 1/6] ASoC: core: Allow topology to override machine driver FE DAI link config Liam Girdwood
2018-04-17 17:09 ` Applied "ASoC: core: Allow topology to override machine driver FE DAI link config." to the asoc tree Mark Brown
2018-04-17 17:11 ` Mark Brown
2018-03-27 13:30 ` [PATCH v2 2/6] ASoC: core: Add name prefix for machines with topology rewrites Liam Girdwood
2018-03-27 13:30 ` [PATCH v2 3/6] ASoC: topology: Give more data to clients via callbacks Liam Girdwood
2018-04-17 17:09 ` Applied "ASoC: topology: Give more data to clients via callbacks" to the asoc tree Mark Brown
2018-04-17 17:11 ` Mark Brown
2018-03-27 13:30 ` [PATCH v2 4/6] ASoC: topology: Add callback for DAPM route load/unload Liam Girdwood
2018-04-17 17:09 ` Applied "ASoC: topology: Add callback for DAPM route load/unload" to the asoc tree Mark Brown
2018-04-17 17:11 ` Mark Brown
2018-06-18 12:00 ` Mark Brown
2018-03-27 13:30 ` Liam Girdwood [this message]
2018-04-17 17:09 ` Applied "ASoC: topology: Check widget kcontrols before deref" " Mark Brown
2018-04-17 17:11 ` Mark Brown
2018-04-26 11:50 ` Mark Brown
2018-03-27 13:30 ` [PATCH v2 6/6] ASoC: topology: Add support for compressed PCMs Liam Girdwood
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=20180327133045.29351-6-liam.r.girdwood@linux.intel.com \
--to=liam.r.girdwood@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/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).