Skip to contentSkip to conversation

ASoC: SOF: backport CVE-2023-54233 to 6.1.y

PATCH Applied Artem Dinaburg 2 participants 4 messages Sep 21 – Sep 22 Stable branch

lore
Share & tools
lore
#0 lore raw

cover ASoC: SOF: backport CVE-2023-54233 to 6.1.y

Hi Greg, Sasha, and SOF maintainers,

I am working through the smaller CVE backports that 6.1.y still needs. This series handles CVE-2023-54233. Patch 1 adds the missing module-info guards; patch 2 is its immediate diagnostic follow-up.

The stable tag on patch 1 says 6.2+, but the same unsafe dereference is in 6.1.y. I kept the pair together and did not bring in the later topology refactors.

Could you please queue this series for 6.1.y?

Thanks,
Artem Dinaburg

AI assistance: An LLM helped find the missing CVE fix, adapt it, and prepare the draft; I reviewed the code and build output.

Guennadi Liakhovetski (1):
ASoC: SOF: avoid a NULL dereference with unsupported widgets

Peter Ujfalusi (1):
ASoC: SOF: ipc4-topology: Clarify bind failure caused by missing
fw_module

 sound/soc/sof/ipc4-topology.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
Signature · 1 line
2.39.5
#1 lore raw

PATCH 1/2 ASoC: SOF: avoid a NULL dereference with unsupported widgets

From: Guennadi Liakhovetski <[email protected]>

[ Upstream commit e3720f92e0237921da537e47a0b24e27899203f8 ]

If an IPC4 topology contains an unsupported widget, its .module_info field won't be set, then sof_ipc4_route_setup() will cause a kernel Oops trying to dereference it. Add a check for such cases.

[ Backport to 6.1.y: although the upstream stable tag names 6.2, the
same module_info dereference is present here; the source change is otherwise unchanged. ]

Assisted-by LLM

---
Stable submission note: patch 1/2 in the CVE-2023-54233 series for Linux 6.1.y.

CVE: CVE-2023-54233

Build: This patch was included in the x86_64 allmodconfig and CONFIG_WERROR=y build.
It produced vmlinux and 9,075 modules; the same four baseline objtool notices appeared, with no new warnings or errors.

 sound/soc/sof/ipc4-topology.c | 8 ++++++++
 1 file changed, 8 insertions(+)
sound/soc/sof/ipc4-topology.c +8 -0
index 49289932ba7e69..9540ba6ef659e6 100644
@@ -1600,6 +1600,14 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *
 	int dst_queue = 0;
 	int ret;
 
+	if (!src_fw_module || !sink_fw_module) {
+		/* The NULL module will print as "(efault)" */
+		dev_err(sdev->dev, "source %s or sink %s widget weren't set up properly\n",
+			src_fw_module->man4_module_entry.name,
+			sink_fw_module->man4_module_entry.name);
+		return -ENODEV;
+	}
+
 	dev_dbg(sdev->dev, "bind %s -> %s\n",
 		src_widget->widget->name, sink_widget->widget->name);
 
Signature · 1 line
2.39.5
#2 lore raw

PATCH 2/2 ASoC: SOF: ipc4-topology: Clarify bind failure caused by missing fw_module

In reply to Artem Dinaburg

From: Peter Ujfalusi <[email protected]>

[ Upstream commit de6aa72b265b72bca2b1897d5000c8f0147d3157 ]

The original patch uses a feature in lib/vsprintf.c to handle the invalid address when tring to print *_fw_module->man4_module_entry.name when the *rc_fw_module is NULL.
This case is handled by check_pointer_msg() internally and turns the invalid pointer to '(efault)' for printing but it is hiding useful information about the circumstances. Change the print to emmit the name of the widget and a note on which side's fw_module is missing.

Fixes e3720f92e023 ("ASoC: SOF: avoid a NULL dereference with unsupported widgets")

Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'

[ Backport to 6.1.y follow-up to e3720f92e023: replace its (efault)
pointer formatting with source/sink diagnostics; only hunk locations differ. ]

Assisted-by LLM

---
Stable submission note: patch 2/2 in the CVE-2023-54233 series for Linux 6.1.y.

CVE: CVE-2023-54233

Build: This patch was included in the x86_64 allmodconfig and CONFIG_WERROR=y build.

 sound/soc/sof/ipc4-topology.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/sof/ipc4-topology.c +6 -4
index 9540ba6ef659e6..ee6f6edec970c4 100644
@@ -1601,10 +1601,12 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *
 	int ret;
 
 	if (!src_fw_module || !sink_fw_module) {
-		/* The NULL module will print as "(efault)" */
-		dev_err(sdev->dev, "source %s or sink %s widget weren't set up properly\n",
-			src_fw_module->man4_module_entry.name,
-			sink_fw_module->man4_module_entry.name);
+		dev_err(sdev->dev,
+			"cannot bind %s -> %s, no firmware module for: %s%s\n",
+			src_widget->widget->name, sink_widget->widget->name,
+			src_fw_module ? "" : " source",
+			sink_fw_module ? "" : " sink");
+
 		return -ENODEV;
 	}
 
Signature · 1 line
2.39.5
maintainer Applied
#3 lore raw
In reply to Artem Dinaburg
Quoted 5 lines

The stable tag on patch 1 says 6.2+, but the same unsafe dereference is in 6.1.y. I kept the pair together and did not bring in the later topology refactors.

Could you please queue this series for 6.1.y?

Queued the series for 6.1, thanks. Keeping the pair together was the right call.

Signature · 2 lines
Thanks,
Sasha