ASoC: amd: acp-sdw-legacy: Bound DAI link iteration
Subsystems (3)
PATCH 1/2 ASoC: amd: acp-sdw-legacy: Bound DAI link iteration
create_sdw_dailinks() walks soc_dais until it finds an entry with initialised cleared, but soc_dais is allocated with exactly num_ends entries. If all entries are initialised, the loop reads past the end of the array.
This was reported by KASAN:
BUG: KASAN: slab-out-of-bounds in mc_probe+0x26b3/0x2774 [snd_acp_sdw_legacy_mach] Read of size 1
Pass the allocated entry count to create_sdw_dailinks() and stop before reading past the array.
--- sound/soc/amd/acp/acp-sdw-legacy-mach.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/amd/acp/acp-sdw-legacy-mach.c +4 -3
@@ -303,13 +303,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,static int create_sdw_dailinks (struct snd_soc_card *card,struct snd_soc_dai_link **dai_links,int *be_id, -struct asoc_sdw_dailink *soc_dais, +struct asoc_sdw_dailink *soc_dais,int num_dais,struct snd_soc_codec_conf **codec_conf) {struct device *dev = card->dev;struct asoc_sdw_mc_private *ctx =snd_soc_card_get_drvdata (card);struct amd_mc_ctx *amd_ctx = (struct amd_mc_ctx *)ctx->private;struct snd_soc_dai_link_component *sdw_platform_component; +int i;int ret; sdw_platform_component = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link_component),
@@ -329,7 +330,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card, }/* generate DAI links by each sdw link */ -while (soc_dais->initialised) { +for (i =0 ; i < num_dais && soc_dais->initialised; i++) {int current_be_id =0 ; ret = create_sdw_dailink(card, soc_dais, dai_links,
@@ -463,7 +464,7 @@ static int soc_card_dai_links_create(struct snd_soc_card *card)/* SDW */ if (sdw_be_num) { ret =create_sdw_dailinks (card, &dai_links, &be_id, - soc_dais, &codec_conf); + soc_dais, num_ends, &codec_conf);if (ret)return ret; }
Signature · 1 line
2.43.0
PATCH 2/2 ASoC: amd: acp-sdw-sof: Bound DAI link iteration
create_sdw_dailinks() walks sof_dais until it finds an entry with initialised cleared, but sof_dais is allocated with exactly num_ends entries. If all entries are initialised, the loop reads past the end of the array.
Pass the allocated entry count to create_sdw_dailinks() and stop before reading past the array.
--- sound/soc/amd/acp/acp-sdw-sof-mach.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/amd/acp/acp-sdw-sof-mach.c +4 -3
@@ -220,13 +220,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,static int create_sdw_dailinks (struct snd_soc_card *card,struct snd_soc_dai_link **dai_links,int *be_id, -struct asoc_sdw_dailink *sof_dais, +struct asoc_sdw_dailink *sof_dais,int num_dais,struct snd_soc_codec_conf **codec_conf) { +int i;int ret;/* generate DAI links by each sdw link */ -while (sof_dais->initialised) { +for (i =0 ; i < num_dais && sof_dais->initialised; i++) {int current_be_id =0 ; ret = create_sdw_dailink(card, sof_dais, dai_links,
@@ -334,7 +335,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)/* SDW */ if (sdw_be_num) { ret =create_sdw_dailinks (card, &dai_links, &be_id, - sof_dais, &codec_conf); + sof_dais, num_ends, &codec_conf);if (ret)return ret; }
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 1 line · Aaron Ma
ASoC: amd: acp-sdw-legacy: Bound DAI link iteration
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2
Thanks!
[1/2] ASoC: amd: acp-sdw-legacy: Bound DAI link iteration
https://git.kernel.org/broonie/sound/c/d49ecdf327cc [2/2] ASoC: amd: acp-sdw-sof: Bound DAI link iteration https://git.kernel.org/broonie/sound/c/4d992e63f52d
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