Unverified Commit 1afd8f06 authored by Cássio Gabriel's avatar Cássio Gabriel Committed by Mark Brown
Browse files

ASoC: amd: acp-sdw-legacy: check CPU DAI name before logging 



devm_kasprintf() can fail and return NULL. The legacy AMD SoundWire
machine driver logs cpus->dai_name before checking the allocation result.

Move the debug print after the NULL check, matching the ordering used by
the SOF AMD SoundWire path after commit 5726b684 ("ASoC: amd/sdw_utils:
avoid NULL deref when devm_kasprintf() fails").

Fixes: 2981d9b0 ("ASoC: amd: acp: add soundwire machine driver for legacy stack")
Signed-off-by: default avatarCássio Gabriel <cassiogabrielcontato@gmail.com>
Link: https://patch.msgid.link/20260511-asoc-amd-acp-sdw-legacy-dai-name-null-v1-1-dc6151b6da8a@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7e68ba28

sound/soc/amd/acp/acp-sdw-legacy-mach.c

+1 −1
Original line number Diff line number Diff line
@@ -260,9 +260,9 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
			cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,

							"SDW%d Pin%d",

							link_num, cpu_pin_id);

			dev_dbg(dev, "cpu->dai_name:%s\n", cpus->dai_name);

			if (!cpus->dai_name)

				return -ENOMEM;

			dev_dbg(dev, "cpu->dai_name:%s\n", cpus->dai_name);



			codec_maps[j].cpu = 0;

			codec_maps[j].codec = j;