From: Greg Kroah-Hartman Date: Fri, 3 Oct 2025 13:23:28 +0000 (+0200) Subject: 6.1-stable patches X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0921d6e3171c9ddaa93e475be52074d83cd303ba;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch --- diff --git a/queue-6.1/asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch b/queue-6.1/asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch new file mode 100644 index 0000000000..36aa9ec08d --- /dev/null +++ b/queue-6.1/asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch @@ -0,0 +1,37 @@ +From 8318e04ab2526b155773313b66a1542476ce1106 Mon Sep 17 00:00:00 2001 +From: Srinivas Kandagatla +Date: Mon, 25 Aug 2025 11:12:45 +0100 +Subject: ASoC: qcom: audioreach: fix potential null pointer dereference + +From: Srinivas Kandagatla + +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 +Cc: Stable@vger.kernel.org +Fixes: 36ad9bf1d93d ("ASoC: qdsp6: audioreach: add topology support") +Signed-off-by: Srinivas Kandagatla +Link: https://patch.msgid.link/20250825101247.152619-2-srinivas.kandagatla@oss.qualcomm.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -504,8 +504,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; diff --git a/queue-6.1/series b/queue-6.1/series index c9318b37e4..1137f98327 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -11,3 +11,4 @@ scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch media-rc-fix-races-with-imon_disconnect.patch media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch +asoc-qcom-audioreach-fix-potential-null-pointer-dereference.patch