]> git.hungrycats.org Git - linux/commitdiff
ASoC: topology: Fix references to freed memory
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Mon, 3 Jun 2024 10:28:15 +0000 (12:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jul 2024 07:53:32 +0000 (09:53 +0200)
[ Upstream commit 97ab304ecd95c0b1703ff8c8c3956dc6e2afe8e1 ]

Most users after parsing a topology file, release memory used by it, so
having pointer references directly into topology file contents is wrong.
Use devm_kmemdup(), to allocate memory as needed.

Reported-by: Jason Montleon <jmontleo@redhat.com>
Link: https://github.com/thesofproject/avs-topology-xml/issues/22#issuecomment-2127892605
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20240603102818.36165-2-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/soc-topology.c

index ba4890991f0d7850b6269c24bc83e5e2f679852c..7add1dbf1d214a18550df70c4d0d2147c735f44f 100644 (file)
@@ -1060,15 +1060,32 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
                        break;
                }
 
-               route->source = elem->source;
-               route->sink = elem->sink;
+               route->source = devm_kmemdup(tplg->dev, elem->source,
+                                            min(strlen(elem->source),
+                                                SNDRV_CTL_ELEM_ID_NAME_MAXLEN),
+                                            GFP_KERNEL);
+               route->sink = devm_kmemdup(tplg->dev, elem->sink,
+                                          min(strlen(elem->sink), SNDRV_CTL_ELEM_ID_NAME_MAXLEN),
+                                          GFP_KERNEL);
+               if (!route->source || !route->sink) {
+                       ret = -ENOMEM;
+                       break;
+               }
 
                /* set to NULL atm for tplg users */
                route->connected = NULL;
-               if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 0)
+               if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 0) {
                        route->control = NULL;
-               else
-                       route->control = elem->control;
+               } else {
+                       route->control = devm_kmemdup(tplg->dev, elem->control,
+                                                     min(strlen(elem->control),
+                                                         SNDRV_CTL_ELEM_ID_NAME_MAXLEN),
+                                                     GFP_KERNEL);
+                       if (!route->control) {
+                               ret = -ENOMEM;
+                               break;
+                       }
+               }
 
                /* add route dobj to dobj_list */
                route->dobj.type = SND_SOC_DOBJ_GRAPH;