| Message ID | 20240624061257.3115467-1-wenst@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 282a4482e198e03781c152c88aac8aa382ef9a55 |
| Headers | show |
| Series | [v2] ASoC: mediatek: mt8195: Add platform entry for ETDM1_OUT_BE dai link | expand |
Il 24/06/24 08:12, Chen-Yu Tsai ha scritto: > Commit e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component > and rework codec link") removed the codec entry for the ETDM1_OUT_BE > dai link entirely instead of replacing it with COMP_EMPTY(). This worked > by accident as the remaining COMP_EMPTY() platform entry became the codec > entry, and the platform entry became completely empty, effectively the > same as COMP_DUMMY() since snd_soc_fill_dummy_dai() doesn't do anything > for platform entries. > > This causes a KASAN out-of-bounds warning in mtk_soundcard_common_probe() > in sound/soc/mediatek/common/mtk-soundcard-driver.c: > > for_each_card_prelinks(card, i, dai_link) { > if (adsp_node && !strncmp(dai_link->name, "AFE_SOF", strlen("AFE_SOF"))) > dai_link->platforms->of_node = adsp_node; > else if (!dai_link->platforms->name && !dai_link->platforms->of_node) > dai_link->platforms->of_node = platform_node; > } > > where the code expects the platforms array to have space for at least one entry. > > Add an COMP_EMPTY() entry so that dai_link->platforms has space. > > Fixes: e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link") > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > --- > Changes since v1: > - Reword commit message with more details on how the original commit > got things wrong, and what this commit adds and fixes > --- > sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c > index ca8751190520..2832ef78eaed 100644 > --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c > +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c > @@ -827,6 +827,7 @@ SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, > > SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, > DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), > + DAILINK_COMP_ARRAY(COMP_EMPTY()), > DAILINK_COMP_ARRAY(COMP_EMPTY())); > > SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE,
On Mon, 24 Jun 2024 14:12:56 +0800, Chen-Yu Tsai wrote: > Commit e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component > and rework codec link") removed the codec entry for the ETDM1_OUT_BE > dai link entirely instead of replacing it with COMP_EMPTY(). This worked > by accident as the remaining COMP_EMPTY() platform entry became the codec > entry, and the platform entry became completely empty, effectively the > same as COMP_DUMMY() since snd_soc_fill_dummy_dai() doesn't do anything > for platform entries. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: mediatek: mt8195: Add platform entry for ETDM1_OUT_BE dai link commit: 282a4482e198e03781c152c88aac8aa382ef9a55 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
diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index ca8751190520..2832ef78eaed 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -827,6 +827,7 @@ SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), + DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE,
Commit e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link") removed the codec entry for the ETDM1_OUT_BE dai link entirely instead of replacing it with COMP_EMPTY(). This worked by accident as the remaining COMP_EMPTY() platform entry became the codec entry, and the platform entry became completely empty, effectively the same as COMP_DUMMY() since snd_soc_fill_dummy_dai() doesn't do anything for platform entries. This causes a KASAN out-of-bounds warning in mtk_soundcard_common_probe() in sound/soc/mediatek/common/mtk-soundcard-driver.c: for_each_card_prelinks(card, i, dai_link) { if (adsp_node && !strncmp(dai_link->name, "AFE_SOF", strlen("AFE_SOF"))) dai_link->platforms->of_node = adsp_node; else if (!dai_link->platforms->name && !dai_link->platforms->of_node) dai_link->platforms->of_node = platform_node; } where the code expects the platforms array to have space for at least one entry. Add an COMP_EMPTY() entry so that dai_link->platforms has space. Fixes: e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link") Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> --- Changes since v1: - Reword commit message with more details on how the original commit got things wrong, and what this commit adds and fixes --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + 1 file changed, 1 insertion(+)