From: Liam Girdwood Date: Thu, 14 Jun 2018 19:26:42 +0000 (+0100) Subject: ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs X-Git-Tag: v4.18.12~117 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=163ac07ff0b29ba45e1e0dd39fe520adee472118;p=users%2Fdwmw2%2Flinux.git ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs [ 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 Signed-off-by: Mark Brown Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 229c123498030..a099c3e455047 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4073,6 +4073,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 */