From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>,
"Mark Brown" <broonie@kernel.org>
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Takashi Iwai <tiwai@suse.com>, Jaroslav Kysela <perex@perex.cz>,
alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
Jason Montleon <jmontleo@redhat.com>
Subject: Re: [PATCH 1/4] ASoC: topology: Fix references to freed memory
Date: Thu, 13 Jun 2024 07:58:15 +0200 [thread overview]
Message-ID: <507e9f6a-7113-4781-8a6d-27e4b87dbe24@linux.intel.com> (raw)
In-Reply-To: <20240603102818.36165-2-amadeuszx.slawinski@linux.intel.com>
On 6/3/24 12:28, Amadeusz Sławiński wrote:
> 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>
> ---
This patch breaks the Intel SOF CI in spectacular ways, with the widgets
names completely garbled with noise such as
host-copier.5.playbackpid.socket
host-copier.5.playbackrt@linux.intel.com>
dai-copier.HDA.iDisp3.playbackrun_t:s0
host-copier.31.playback\xff`\x86\xba\x034\x89\xff\xff@N\x83\xb83\x89\xff\xff\x10\x84\xe9\x8b\xff\xff\xff\xffS\x81ی\xff\xff\xff\xff\x0f
https://github.com/thesofproject/linux/pull/5057#issuecomment-2164470192
I am going to revert this patchset in the SOF tree.
> sound/soc/soc-topology.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
> index 90ca37e008b32..75d9395a18ed4 100644
> --- a/sound/soc/soc-topology.c
> +++ b/sound/soc/soc-topology.c
> @@ -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;
97ab304ecd95c0b1703ff8c8c3956dc6e2afe8e1 is the first bad commit
commit 97ab304ecd95c0b1703ff8c8c3956dc6e2afe8e1
Author: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Date: Mon Jun 3 12:28:15 2024 +0200
ASoC: topology: Fix references to freed memory
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>
sound/soc/soc-topology.c | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
next prev parent reply other threads:[~2024-06-13 5:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 10:28 [PATCH 0/4] ASoC: topology: Fix route memory corruption Amadeusz Sławiński
2024-06-03 10:28 ` [PATCH 1/4] ASoC: topology: Fix references to freed memory Amadeusz Sławiński
2024-06-13 5:58 ` Pierre-Louis Bossart [this message]
2024-06-13 6:27 ` Péter Ujfalusi
2024-06-13 6:29 ` Péter Ujfalusi
2024-06-13 6:44 ` Péter Ujfalusi
2024-06-13 7:31 ` Amadeusz Sławiński
2024-06-03 10:28 ` [PATCH 2/4] ASoC: Intel: avs: Fix route override Amadeusz Sławiński
2024-06-03 10:28 ` [PATCH 3/4] ASoC: topology: Do not assign fields that are already set Amadeusz Sławiński
2024-06-03 10:28 ` [PATCH 4/4] ASoC: topology: Clean up route loading Amadeusz Sławiński
2024-06-11 16:12 ` [PATCH 0/4] ASoC: topology: Fix route memory corruption Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=507e9f6a-7113-4781-8a6d-27e4b87dbe24@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=jmontleo@redhat.com \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox