Skip to contentSkip to conversation

Patch "ASoC: dapm: Fix possible uninitialized variable in snd_soc_dapm_get_volsw()" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 28, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ASoC: dapm: Fix possible uninitialized variable in snd_soc_dapm_get_volsw()

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-dapm-fix-possible-uninitialized-variable-in-snd_soc_dapm_get_volsw.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 01ad5e7de67b408d9b48b437b06a9938ddf460b5 Mon Sep 17 00:00:00 2001

From: Chen-Yu Tsai <[email protected]>
Date: Sat, 27 Aug 2016 19:27:58 +0800
Subject: ASoC: dapm: Fix possible uninitialized variable in snd_soc_dapm_get_volsw()

From: Chen-Yu Tsai <[email protected]>

commit 01ad5e7de67b408d9b48b437b06a9938ddf460b5 upstream.

If soc_dapm_read() fails, val will be uninitialized, and bogus values will be written later:

	ret = soc_dapm_read(dapm, reg, &val);
	val = (val >> shift) & mask;

However, the compiler does not give a warning. Return on error before val is really used to avoid this.

This is similar to the commit 6912831623c5 ("ASoC: dapm: Fix uninitialized variable in snd_soc_dapm_get_enum_double()")

Fixes ce0fc93ae56e (ASoC: Add DAPM support at the component level)
---
 sound/soc/soc-dapm.c |    3 +++
 1 file changed, 3 insertions(+)
sound/soc/soc-dapm.c +3 -0
@@ -3015,6 +3015,9 @@ int snd_soc_dapm_get_volsw(struct snd_kc
 	}
 	mutex_unlock(&card->dapm_mutex);
 
+	if (ret)
+		return ret;
+
 	if (invert)
 		ucontrol->value.integer.value[0] = max - val;
 	else

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/asoc-dapm-fix-kcontrol-creation-for-output-driver-widget.patch queue-4.4/asoc-dapm-fix-value-setting-for-_enum_double-mux-s-second-channel.patch queue-4.4/asoc-dapm-fix-possible-uninitialized-variable-in-snd_soc_dapm_get_volsw.patch