Skip to content

Commit

Permalink
ASoC: soc-core.c: Skip dummy codec when adding platforms
Browse files Browse the repository at this point in the history
[ Upstream commit 23fb6bc ]

When pcm_runtime is adding platform components it will scan all
registered components. In case of DPCM FE/BE some DAI links will
configure dummy platform. However both dummy codec and dummy platform
are using "snd-soc-dummy" as component->name. Dummy codec should be
skipped when adding platforms otherwise there'll be overflow and UBSAN
complains.

Reported-by: Zhipeng Wang <zhipeng.wang_1@nxp.com>
Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
Link: https://msgid.link/r/20240305065606.3778642-1-chancel.liu@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Chancel Liu authored and gregkh committed Apr 13, 2024
1 parent a2a46bb commit ac372b7
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sound/soc/soc-core.c
Expand Up @@ -1218,6 +1218,9 @@ static int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
if (!snd_soc_is_matching_component(platform, component))
continue;

if (snd_soc_component_is_dummy(component) && component->num_dai)
continue;

snd_soc_rtd_add_component(rtd, component);
}
}
Expand Down

0 comments on commit ac372b7

Please sign in to comment.