]> www.infradead.org Git - users/hch/misc.git/commitdiff
ASoC: Intel: avs: Do not share the name pointer between components
authorCezary Rojewski <cezary.rojewski@intel.com>
Mon, 18 Aug 2025 10:41:25 +0000 (12:41 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 18 Aug 2025 12:10:07 +0000 (13:10 +0100)
By sharing 'name' directly, tearing down components may lead to
use-after-free errors. Duplicate the name to avoid that.

At the same time, update the order of operations - since commit
cee28113db17 ("ASoC: dmaengine_pcm: Allow passing component name via
config") the framework does not override component->name if set before
invoking the initializer.

Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250818104126.526442-4-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/avs/pcm.c

index 67ce6675eea755bed8ed4ab3b4134d5b846a3baa..e738deb2d314cffb4c04158c407257d45ac119f3 100644 (file)
@@ -1390,16 +1390,18 @@ int avs_soc_component_register(struct device *dev, const char *name,
        if (!acomp)
                return -ENOMEM;
 
-       ret = snd_soc_component_initialize(&acomp->base, drv, dev);
-       if (ret < 0)
-               return ret;
+       acomp->base.name = devm_kstrdup(dev, name, GFP_KERNEL);
+       if (!acomp->base.name)
+               return -ENOMEM;
 
-       /* force name change after ASoC is done with its init */
-       acomp->base.name = name;
        INIT_LIST_HEAD(&acomp->node);
 
        drv->use_dai_pcm_id = !obsolete_card_names;
 
+       ret = snd_soc_component_initialize(&acomp->base, drv, dev);
+       if (ret < 0)
+               return ret;
+
        return snd_soc_add_component(&acomp->base, cpu_dais, num_cpu_dais);
 }