Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05f78b1a authored by Liam Girdwood's avatar Liam Girdwood Committed by Greg Kroah-Hartman
Browse files

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: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3fd534a5

sound/soc/soc-dapm.c

+7 −0
Original line number Diff line number Diff line
@@ -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 */