]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: qcom: qdsp6: topology: check widget type before accessing data
authorSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Thu, 2 Apr 2026 08:11:08 +0000 (08:11 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 2 Apr 2026 15:33:39 +0000 (16:33 +0100)
Check widget type before accessing the private data, as this could a
virtual widget which is no associated with a dsp graph, container and
module. Accessing witout check could lead to incorrect memory access.

Fixes: 36ad9bf1d93d ("ASoC: qdsp6: audioreach: add topology support")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20260402081118.348071-4-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/qdsp6/topology.c

index e732fac9b8ca053cd37f8545fb1bba0021cb9e4e..1f69fba6de26d19f1624dc6d9a4d3c68e84cf9b8 100644 (file)
@@ -952,9 +952,6 @@ static int audioreach_widget_unload(struct snd_soc_component *scomp,
        struct audioreach_container *cont;
        struct audioreach_module *mod;
 
-       mod = dobj->private;
-       cont = mod->container;
-
        if (w->id == snd_soc_dapm_mixer) {
                /* virtual widget */
                struct snd_ar_control *scontrol = dobj->private;
@@ -963,6 +960,11 @@ static int audioreach_widget_unload(struct snd_soc_component *scomp,
                kfree(scontrol);
                return 0;
        }
+       mod = dobj->private;
+       if (!mod)
+               return 0;
+
+       cont = mod->container;
 
        mutex_lock(&apm->lock);
        idr_remove(&apm->modules_idr, mod->instance_id);