Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	stable@vger.kernel.org, broonie@kernel.org,
	Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 1/6] ASoC: samsung: tm2_wm5510: fix check of of_parse return value
Date: Mon, 22 Feb 2021 15:33:01 -0600	[thread overview]
Message-ID: <20210222213306.22654-2-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20210222213306.22654-1-pierre-louis.bossart@linux.intel.com>

cppcheck warning:

sound/soc/samsung/tm2_wm5110.c:605:6: style: Variable 'ret' is
reassigned a value before the old one has been
used. [redundantAssignment]
 ret = devm_snd_soc_register_component(dev, &tm2_component,
     ^
sound/soc/samsung/tm2_wm5110.c:554:7: note: ret is assigned
  ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
      ^
sound/soc/samsung/tm2_wm5110.c:605:6: note: ret is overwritten
 ret = devm_snd_soc_register_component(dev, &tm2_component,
     ^

The args is a stack variable, so it could have junk (uninitialized)
therefore args.np could have a non-NULL and random value even though
property was missing. Later could trigger invalid pointer dereference.

This patch provides the correct fix, there's no need to check for
args.np because args.np won't be initialized on errors.

Fixes: 75fa6833aef3 ("ASoC: samsung: tm2_wm5110: check of_parse return value")
Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board")
Cc: <stable@vger.kernel.org>
Suggested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/samsung/tm2_wm5110.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index da6204248f82..125e07f65d2b 100644
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -553,7 +553,7 @@ static int tm2_probe(struct platform_device *pdev)
 
 		ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
 						 cells_name, i, &args);
-		if (ret || !args.np) {
+		if (ret) {
 			dev_err(dev, "i2s-controller property parse error: %d\n", i);
 			ret = -EINVAL;
 			goto dai_node_put;
-- 
2.25.1


  reply	other threads:[~2021-02-22 21:35 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-22 21:33 [PATCH v2 0/6] ASoC: samsung: remove cppcheck warnings Pierre-Louis Bossart
2021-02-22 21:33 ` Pierre-Louis Bossart [this message]
2021-02-23 10:47   ` [PATCH v2 1/6] ASoC: samsung: tm2_wm5510: fix check of of_parse return value Sylwester Nawrocki
2021-02-23 19:40   ` Krzysztof Kozlowski
2021-02-22 21:33 ` [PATCH v2 2/6] ASoC: samsung: i2s: remove unassigned variable Pierre-Louis Bossart
2021-02-23 10:54   ` Sylwester Nawrocki
2021-02-22 21:33 ` [PATCH v2 3/6] ASoC: samsung: s3c24xx_simtec: add missing error check Pierre-Louis Bossart
2021-02-23 10:57   ` Sylwester Nawrocki
2021-02-22 21:33 ` [PATCH v2 4/6] ASoC: samsung: smdk_wm8994: add missing return Pierre-Louis Bossart
2021-02-23 11:08   ` Sylwester Nawrocki
2021-02-22 21:33 ` [PATCH v2 5/6] ASoC: samsung: snow: remove useless test Pierre-Louis Bossart
2021-02-23 11:19   ` Sylwester Nawrocki
2021-02-22 21:33 ` [PATCH v2 6/6] ASoC: samsung: tm2_wm5510: remove shadowed variable Pierre-Louis Bossart
2021-02-23 11:25   ` Sylwester Nawrocki
2021-02-23 15:13     ` Pierre-Louis Bossart
2021-02-23 18:29       ` Krzysztof Kozlowski
2021-02-23 19:24         ` Sylwester Nawrocki
2021-02-23 19:41   ` Krzysztof Kozlowski

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=20210222213306.22654-2-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=krzk@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tiwai@suse.de \
    /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