ASoC: rt274: Variable "buf" in function rt274_jack_detect() could be uninitialized
diff mbox series

Message ID 20190104202708.14759-1-yzhai003@ucr.edu
State New
Headers show
Series
  • ASoC: rt274: Variable "buf" in function rt274_jack_detect() could be uninitialized
Related show

Commit Message

Yizhuo Zhai Jan. 4, 2019, 8:27 p.m. UTC
In function rt274_jack_detect(), local variable "buf" could
be uninitialized if function regmap_read() returns -EINVAL.
However, it will be used to calculate "hp" and "mic" and
make their value unpredictable while those value are used
in the caller. This is potentially unsafe.

Signed-off-by: Yizhuo <yzhai003@ucr.edu>
---
 sound/soc/codecs/rt274.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Mark Brown Jan. 7, 2019, 4:58 p.m. UTC | #1
On Fri, Jan 04, 2019 at 12:27:08PM -0800, Yizhuo wrote:
> In function rt274_jack_detect(), local variable "buf" could
> be uninitialized if function regmap_read() returns -EINVAL.
> However, it will be used to calculate "hp" and "mic" and
> make their value unpredictable while those value are used
> in the caller. This is potentially unsafe.

This doesn't apply against current code, please check and resend.

Patch
diff mbox series

diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c
index cd048df76232..a2c1a6df8df6 100644
--- a/sound/soc/codecs/rt274.c
+++ b/sound/soc/codecs/rt274.c
@@ -353,6 +353,7 @@  static void rt274_index_sync(struct snd_soc_codec *codec)
 static int rt274_jack_detect(struct rt274_priv *rt274, bool *hp, bool *mic)
 {
 	unsigned int buf;
+	int ret = 0;
 
 	*hp = false;
 	*mic = false;
@@ -360,9 +361,15 @@  static int rt274_jack_detect(struct rt274_priv *rt274, bool *hp, bool *mic)
 	if (!rt274->codec)
 		return -EINVAL;
 
-	regmap_read(rt274->regmap, RT274_GET_HP_SENSE, &buf);
+	ret = regmap_read(rt274->regmap, RT274_GET_HP_SENSE, &buf);
+	if (ret)
+		return ret;
+
 	*hp = buf & 0x80000000;
-	regmap_read(rt274->regmap, RT274_GET_MIC_SENSE, &buf);
+	ret = regmap_read(rt274->regmap, RT274_GET_MIC_SENSE, &buf);
+	if (ret)
+		return ret;
+
 	*mic = buf & 0x80000000;
 
 	pr_debug("*hp = %d *mic = %d\n", *hp, *mic);