]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: SOF: avoid a NULL dereference with unsupported widgets
authorGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Wed, 29 Mar 2023 11:38:28 +0000 (14:38 +0300)
committerRoxana Nicolescu <roxana.nicolescu@canonical.com>
Wed, 17 May 2023 11:34:01 +0000 (13:34 +0200)
BugLink: https://bugs.launchpad.net/bugs/2016879
commit e3720f92e0237921da537e47a0b24e27899203f8 upstream.

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.

Cc: stable@vger.kernel.org # 6.2
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230329113828.28562-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
sound/soc/sof/ipc4-topology.c

index 6da6137fa2cbc0c836e31efe1b3dc6c46e5ee2f1..4f7adbe671f3ee32585e193825b6ce89d4376509 100644 (file)
@@ -1686,6 +1686,14 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *
        u32 header, extension;
        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;
+       }
+
        sroute->src_queue_id = sof_ipc4_get_queue_id(src_widget, sink_widget,
                                                     SOF_PIN_TYPE_SOURCE);
        if (sroute->src_queue_id < 0) {