On 6/13/24 13:11, Péter Ujfalusi wrote: > > > On 13/06/2024 12:01, Amadeusz Sławiński wrote: >> It was reported that recent fix for memory corruption during topology >> load, causes corruption in other cases. Instead of being overeager with >> checking topology, assume that it is properly formatted and just >> duplicate strings. > > Reviewed-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx> Test results look much better indeed with https://github.com/thesofproject/linux/pull/5057 Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> > >> Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> >> Closes: https://lore.kernel.org/linux-sound/171812236450.201359.3019210915105428447.b4-ty@xxxxxxxxxx/T/#m8c4bd5abf453960fde6f826c4b7f84881da63e9d >> Suggested-by: Péter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx> >> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx> >> --- >> sound/soc/soc-topology.c | 12 +++--------- >> 1 file changed, 3 insertions(+), 9 deletions(-) >> >> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c >> index 0225bc5fc425a..4b166294602fa 100644 >> --- a/sound/soc/soc-topology.c >> +++ b/sound/soc/soc-topology.c >> @@ -1052,21 +1052,15 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, >> break; >> } >> >> - route->source = devm_kmemdup(tplg->dev, elem->source, >> - min(strlen(elem->source), maxlen), >> - GFP_KERNEL); >> - route->sink = devm_kmemdup(tplg->dev, elem->sink, >> - min(strlen(elem->sink), maxlen), >> - GFP_KERNEL); >> + route->source = devm_kstrdup(tplg->dev, elem->source, GFP_KERNEL); >> + route->sink = devm_kstrdup(tplg->dev, elem->sink, GFP_KERNEL); >> if (!route->source || !route->sink) { >> ret = -ENOMEM; >> break; >> } >> >> if (strnlen(elem->control, maxlen) != 0) { >> - route->control = devm_kmemdup(tplg->dev, elem->control, >> - min(strlen(elem->control), maxlen), >> - GFP_KERNEL); >> + route->control = devm_kstrdup(tplg->dev, elem->control, GFP_KERNEL); >> if (!route->control) { >> ret = -ENOMEM; >> break; >
