Skip to contentSkip to conversation

ASoC: topology: avoid uninitialized kcontrol_type

PATCH In review Arnd Bergmann 3 participants 3 messages Dec 9, 2016 – Dec 12, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: topology: avoid uninitialized kcontrol_type

When num_kcontrols is zero, widget->dobj.widget.kcontrol_type gets set to an uninitialized local variable:

sound/soc/soc-topology.c: In function 'soc_tplg_dapm_widget_create':
sound/soc/soc-topology.c:1566:36: error: 'kcontrol_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]

I could not figure out which of the valid types would be appropriate here, so this sets it to '0', which is invalid but at least well-defined here. There is probably a better way to address the issue.

Fixes eea3dd4f1247 ("ASoC: topology: Only free TLV for volume mixers of a widget")
---
 sound/soc/soc-topology.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-topology.c +1 -0
index 11feb19e9730..65670b2b408c 100644
@@ -1485,6 +1485,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
 	tplg->pos +=
 		(sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size);
 	if (w->num_kcontrols == 0) {
+		kcontrol_type = 0;
 		template.num_kcontrols = 0;
 		goto widget;
 	}
Signature · 1 line
2.9.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Arnd,

Quoted 21 lines · Arnd Bergmann

When num_kcontrols is zero, widget->dobj.widget.kcontrol_type gets set to an uninitialized local variable:

sound/soc/soc-topology.c: In function 'soc_tplg_dapm_widget_create':
sound/soc/soc-topology.c:1566:36: error: 'kcontrol_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]

I could not figure out which of the valid types would be appropriate here, so this sets it to '0', which is invalid but at least well-defined here. There is probably a better way to address the issue.

Fixes eea3dd4f1247 ("ASoC: topology: Only free TLV for volume mixers of a widget")
---
 sound/soc/soc-topology.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-topology.c +0 -0
index 11feb19e9730..65670b2b408c 100644

sound/soc/soc-topology.c static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, · line 1491

Quoted 7 lines
sound/soc/soc-topology.c +1 -0
@@ -1485,6 +1485,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
 	tplg->pos +=
 		(sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size);
 	if (w->num_kcontrols == 0) {
+		kcontrol_type = 0;
 		template.num_kcontrols = 0;
 		goto widget;
 	}

This bug was already reported but not fixed yet:
[alsa-devel] [bug report] ASoC: topology: Only free TLV for volume mixers of a widget
http://mailman.alsa-project.org/pipermail/alsa-devel/2016-December/115577.html

As you said, this solution looks band-aid, however we have no alternatives to fix the warning...

Regards

Takashi Sakamoto

maintainer
#2 lore raw

Applied "ASoC: topology: avoid uninitialized kcontrol_type" to the asoc tree

In reply to Arnd Bergmann

The patch

ASoC: topology: avoid uninitialized kcontrol_type

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From dd5abb742071a962be4403f171063ed1e9d4202d Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Fri, 9 Dec 2016 12:51:46 +0100
Subject: [PATCH] ASoC: topology: avoid uninitialized kcontrol_type

When num_kcontrols is zero, widget->dobj.widget.kcontrol_type gets set to an uninitialized local variable:

sound/soc/soc-topology.c: In function 'soc_tplg_dapm_widget_create':
sound/soc/soc-topology.c:1566:36: error: 'kcontrol_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]

I could not figure out which of the valid types would be appropriate here, so this sets it to '0', which is invalid but at least well-defined here. There is probably a better way to address the issue.

Fixes eea3dd4f1247 ("ASoC: topology: Only free TLV for volume mixers of a widget")
---
 sound/soc/soc-topology.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-topology.c +1 -0
index 11feb19e9730..65670b2b408c 100644
@@ -1485,6 +1485,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
 	tplg->pos +=
 		(sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size);
 	if (w->num_kcontrols == 0) {
+		kcontrol_type = 0;
 		template.num_kcontrols = 0;
 		goto widget;
 	}
Signature · 1 line
2.11.0