]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: amd/sdw_utils: avoid NULL deref when devm_kasprintf() fails
authorLi Qiang <liqiang01@kylinos.cn>
Wed, 15 Oct 2025 07:55:30 +0000 (15:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Oct 2025 14:20:37 +0000 (16:20 +0200)
[ Upstream commit 5726b68473f7153a7f6294185e5998b7e2a230a2 ]

devm_kasprintf() may return NULL on memory allocation failure,
but the debug message prints cpus->dai_name before checking it.
Move the dev_dbg() call after the NULL check to prevent potential
NULL pointer dereference.

Fixes: cb8ea62e64020 ("ASoC: amd/sdw_utils: add sof based soundwire generic machine driver")
Signed-off-by: Li Qiang <liqiang01@kylinos.cn>
Link: https://patch.msgid.link/20251015075530.146851-1-liqiang01@kylinos.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/amd/acp/acp-sdw-sof-mach.c

index 99a244f495bd30f3166e3191a85a4fe0655b3b4b..876f0b7fcd3deed36df91fccbfe74e1dcd62b54c 100644 (file)
@@ -216,9 +216,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;