stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>,
	"Jason Montleon" <jmontleo@redhat.com>,
	"Cezary Rojewski" <cezary.rojewski@intel.com>,
	"Mark Brown" <broonie@kernel.org>,
	"Sasha Levin" <sashal@kernel.org>,
	lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com,
	linux-sound@vger.kernel.org
Subject: [PATCH AUTOSEL 6.6 05/33] ASoC: topology: Fix references to freed memory
Date: Tue,  9 Jul 2024 12:21:31 -0400	[thread overview]
Message-ID: <20240709162224.31148-5-sashal@kernel.org> (raw)
In-Reply-To: <20240709162224.31148-1-sashal@kernel.org>

From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

[ 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 | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 2362c282ec8b3..c63545b27d450 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;
-- 
2.43.0


  parent reply	other threads:[~2024-07-09 16:22 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-09 16:21 [PATCH AUTOSEL 6.6 01/33] Input: elantech - fix touchpad state on resume for Lenovo N24 Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 02/33] Input: i8042 - add Ayaneo Kun to i8042 quirk table Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 03/33] ASoC: rt722-sdca-sdw: add silence detection register as volatile Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 04/33] Input: xpad - add support for ASUS ROG RAIKIRI PRO Sasha Levin
2024-07-09 16:21 ` Sasha Levin [this message]
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 06/33] ASoC: topology: Do not assign fields that are already set Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 07/33] ASoC: topology: Clean up route loading Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 08/33] bytcr_rt5640 : inverse jack detect for Archos 101 cesium Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 09/33] ALSA: dmaengine: Synchronize dma channel after drop() Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 10/33] ASoC: ti: davinci-mcasp: Set min period size using FIFO config Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 11/33] ASoC: ti: omap-hdmi: Fix too long driver name Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 12/33] ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 13/33] ASoC: rt722-sdca-sdw: add debounce time for type detection Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 14/33] ASoC: topology: Fix route memory corruption Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 15/33] nvme: fix NVME_NS_DEAC may incorrectly identifying the disk as EXT_LBA Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 16/33] Input: ads7846 - use spi_device_id table Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 17/33] can: kvaser_usb: fix return value for hif_usb_send_regout Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 18/33] gpio: pca953x: fix pca953x_irq_bus_sync_unlock race Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 19/33] octeontx2-pf: Fix coverity and klockwork issues in octeon PF driver Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 20/33] s390/sclp: Fix sclp_init() cleanup on failure Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 21/33] platform/mellanox: nvsw-sn2201: Add check for platform_device_add_resources Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 22/33] platform/x86: wireless-hotkey: Add support for LG Airplane Button Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 23/33] platform/x86: lg-laptop: Remove LGEX0815 hotkey handling Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 24/33] platform/x86: lg-laptop: Change ACPI device id Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 25/33] platform/x86: lg-laptop: Use ACPI device handle when evaluating WMAB/WMBB Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 26/33] btrfs: qgroup: fix quota root leak after quota disable failure Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 27/33] ibmvnic: Add tx check to prevent skb leak Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 28/33] ALSA: PCM: Allow resume only for suspended streams Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 29/33] ALSA: hda/relatek: Enable Mute LED on HP Laptop 15-gw0xxx Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 30/33] ALSA: dmaengine_pcm: terminate dmaengine before synchronize Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 31/33] parisc: use generic sys_fanotify_mark implementation Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 32/33] ASoC: amd: yc: Fix non-functional mic on ASUS M5602RA Sasha Levin
2024-07-09 16:21 ` [PATCH AUTOSEL 6.6 33/33] net: usb: qmi_wwan: add Telit FN912 compositions Sasha Levin

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=20240709162224.31148-5-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=amadeuszx.slawinski@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=cezary.rojewski@intel.com \
    --cc=jmontleo@redhat.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=stable@vger.kernel.org \
    --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;
as well as URLs for NNTP newsgroup(s).