From: Chen-Yu Tsai <wens@csie.org>
Date: Sat, 27 Aug 2016 11:27:58 +0000 (+0800)
Subject: ASoC: dapm: Fix possible uninitialized variable in snd_soc_dapm_get_volsw()
X-Git-Tag: v4.9-rc1~4^2~4^2~18^2~2
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=01ad5e7de67b408d9b48b437b06a9938ddf460b5;p=cascardo%2Flinux.git

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

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)
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d908ff8f9755..edff395faccf 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3049,6 +3049,9 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
 	}
 	mutex_unlock(&card->dapm_mutex);
 
+	if (ret)
+		return ret;
+
 	if (invert)
 		ucontrol->value.integer.value[0] = max - val;
 	else