]> git.itanic.dy.fi Git - linux-stable/commitdiff
ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
authorLiam Girdwood <liam.r.girdwood@linux.intel.com>
Thu, 14 Jun 2018 19:26:42 +0000 (20:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Oct 2018 00:00:53 +0000 (17:00 -0700)
[ Upstream commit e01b4f624278d5efe5fb5da585ca371947b16680 ]

Sometime a component or topology may configure a DAI widget with no
private data leading to a dev_dbg() dereferencne of this data.

Fix this to check for non NULL private data and let users know if widget
is missing DAI.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-dapm.c

index 1c9f6a0d234f0a25657a6ea139319fb87b3e42f5..53c9d7525639362db277e0f6bd90ec09d6a6e4a8 100644 (file)
@@ -4005,6 +4005,13 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
                        continue;
                }
 
+               /* let users know there is no DAI to link */
+               if (!dai_w->priv) {
+                       dev_dbg(card->dev, "dai widget %s has no DAI\n",
+                               dai_w->name);
+                       continue;
+               }
+
                dai = dai_w->priv;
 
                /* ...find all widgets with the same stream and link them */