Skip to contentSkip to conversation

ASoC: meson: axg-card: fix null pointer dereference in clean up

PATCH In review Jerome Brunet 2 participants 2 messages Jun 10, 2019

Subsystems (4)
lore
Share & tools
lore

Jerome Brunet

author maintainer
#0 lore raw

PATCH 1/1 ASoC: meson: axg-card: fix null pointer dereference in clean up

When using modern dai_link style, we must first make sure the struct snd_soc_dai_link_component exists before accessing its members.

In case of early probe deferral, some of the '.cpus' or '.codecs' may not have been allocated yet. Check this before calling of_node_put() on the structure member.

Fixes c84836d7f650 ("ASoC: meson: axg-card: use modern dai_link style")
Cc Kuninori Morimoto <[email protected]>
---
 sound/soc/meson/axg-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/meson/axg-card.c +4 -2
index fb03258d00ae..70bb0cbad233 100644
@@ -115,9 +115,11 @@ static void axg_card_clean_references(struct axg_card *priv)
 
 	if (card->dai_link) {
 		for_each_card_prelinks(card, i, link) {
-			of_node_put(link->cpus->of_node);
+			if (link->cpus)
+				of_node_put(link->cpus->of_node);
 			for_each_link_codecs(link, j, codec)
-				of_node_put(codec->of_node);
+				if (codec)
+					of_node_put(codec->of_node);
 		}
 	}
 
Signature · 1 line
2.20.1
maintainer
#1 lore raw

Applied "ASoC: meson: axg-card: fix null pointer dereference in clean up" to the asoc tree

The patch

ASoC: meson: axg-card: fix null pointer dereference in clean up

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3

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 960f428ca0a04a59e74639571126245a3efc4bcf Mon Sep 17 00:00:00 2001

From: Jerome Brunet <[email protected]>
Date: Mon, 10 Jun 2019 14:53:44 +0200
Subject: [PATCH] ASoC: meson: axg-card: fix null pointer dereference in clean
up

When using modern dai_link style, we must first make sure the struct snd_soc_dai_link_component exists before accessing its members.

In case of early probe deferral, some of the '.cpus' or '.codecs' may not have been allocated yet. Check this before calling of_node_put() on the structure member.

Fixes c84836d7f650 ("ASoC: meson: axg-card: use modern dai_link style")
Cc Kuninori Morimoto <[email protected]>
---
 sound/soc/meson/axg-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/meson/axg-card.c +4 -2
index fb03258d00ae..70bb0cbad233 100644
@@ -115,9 +115,11 @@ static void axg_card_clean_references(struct axg_card *priv)
 
 	if (card->dai_link) {
 		for_each_card_prelinks(card, i, link) {
-			of_node_put(link->cpus->of_node);
+			if (link->cpus)
+				of_node_put(link->cpus->of_node);
 			for_each_link_codecs(link, j, codec)
-				of_node_put(codec->of_node);
+				if (codec)
+					of_node_put(codec->of_node);
 		}
 	}
 
Signature · 1 line
2.20.1