]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.16-stable patches master
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Oct 2025 13:23:58 +0000 (15:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Oct 2025 13:23:58 +0000 (15:23 +0200)
added patches:
asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch

queue-6.16/asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch [new file with mode: 0644]
queue-6.16/series

diff --git a/queue-6.16/asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch b/queue-6.16/asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch
new file mode 100644 (file)
index 0000000..6409136
--- /dev/null
@@ -0,0 +1,37 @@
+From 8318e04ab2526b155773313b66a1542476ce1106 Mon Sep 17 00:00:00 2001
+From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
+Date: Mon, 25 Aug 2025 11:12:45 +0100
+Subject: ASoC: qcom: audioreach: fix potential null pointer dereference
+
+From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
+
+commit 8318e04ab2526b155773313b66a1542476ce1106 upstream.
+
+It is possible that the topology parsing function
+audioreach_widget_load_module_common() could return NULL or an error
+pointer. Add missing NULL check so that we do not dereference it.
+
+Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
+Cc: Stable@vger.kernel.org
+Fixes: 36ad9bf1d93d ("ASoC: qdsp6: audioreach: add topology support")
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
+Link: https://patch.msgid.link/20250825101247.152619-2-srinivas.kandagatla@oss.qualcomm.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/qcom/qdsp6/topology.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/soc/qcom/qdsp6/topology.c
++++ b/sound/soc/qcom/qdsp6/topology.c
+@@ -587,8 +587,8 @@ static int audioreach_widget_load_module
+               return PTR_ERR(cont);
+       mod = audioreach_parse_common_tokens(apm, cont, &tplg_w->priv, w);
+-      if (IS_ERR(mod))
+-              return PTR_ERR(mod);
++      if (IS_ERR_OR_NULL(mod))
++              return mod ? PTR_ERR(mod) : -ENODEV;
+       dobj = &w->dobj;
+       dobj->private = mod;
index a6282db237456a0f2fd22e016c9335785ad13eef..6f2b079954edfed8ea8641e2e38ee205be191ff1 100644 (file)
@@ -11,3 +11,4 @@ mm-swap-check-for-stable-address-space-before-operating-on-the-vma.patch
 wifi-ath11k-fix-null-dereference-in-ath11k_qmi_m3_load.patch
 media-iris-fix-memory-leak-by-freeing-untracked-persist-buffer.patch
 media-stm32-csi-fix-dereference-before-null-check.patch
+asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch