From: Sasha Levin Date: Wed, 20 May 2026 01:16:31 +0000 (-0400) Subject: Drop asoc-sof-intel-hda-fix-null-pointer-dereference.patch X-Git-Tag: v6.6.141~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da98921806ab9c5f6a94810d6cc43f9e7b07990;p=thirdparty%2Fkernel%2Fstable-queue.git Drop asoc-sof-intel-hda-fix-null-pointer-dereference.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/asoc-sof-intel-hda-fix-null-pointer-dereference.patch b/queue-6.6/asoc-sof-intel-hda-fix-null-pointer-dereference.patch deleted file mode 100644 index 0ac0056973..0000000000 --- a/queue-6.6/asoc-sof-intel-hda-fix-null-pointer-dereference.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e49f874445e39df28b17808d9a9dd5d197af1a1b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 19 May 2026 18:44:10 +0800 -Subject: ASoC: SOF: Intel: hda: Fix NULL pointer dereference - -From: Ranjani Sridharan - -[ Upstream commit 16c589567a956d46a7c1363af3f64de3d420af20 ] - -If there's a mismatch between the DAI links in the machine driver and -the topology, it is possible that the playback/capture widget is not -set, especially in the case of loopback capture for echo reference -where we use the dummy DAI link. Return the error when the widget is not -set to avoid a null pointer dereference like below when the topology is -broken. - -RIP: 0010:hda_dai_get_ops.isra.0+0x14/0xa0 [snd_sof_intel_hda_common] - -Signed-off-by: Ranjani Sridharan -Reviewed-by: Bard Liao -Reviewed-by: Liam Girdwood -Reviewed-by: Mateusz Redzynia -Signed-off-by: Peter Ujfalusi -Link: https://patch.msgid.link/20260204081833.16630-10-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -[ Minor context conflict resolved. ] -Signed-off-by: Alva Lan -Signed-off-by: Sasha Levin ---- - sound/soc/sof/intel/hda-dai.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c -index 19ec1a45737ea..097bcc7822a7d 100644 ---- a/sound/soc/sof/intel/hda-dai.c -+++ b/sound/soc/sof/intel/hda-dai.c -@@ -77,11 +77,22 @@ static const struct hda_dai_widget_dma_ops * - hda_dai_get_ops(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) - { - struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(cpu_dai, substream->stream); -- struct snd_sof_widget *swidget = w->dobj.private; -+ struct snd_sof_widget *swidget; - struct snd_sof_dev *sdev; - struct snd_sof_dai *sdai; - -+ /* -+ * this is unlikely if the topology and the machine driver DAI links match. -+ * But if there's a missing DAI link in topology, this will prevent a NULL pointer -+ * dereference later on. -+ */ -+ if (!w) { -+ dev_err(cpu_dai->dev, "%s: widget is NULL\n", __func__); -+ return NULL; -+ } -+ - sdev = widget_to_sdev(w); -+ swidget = w->dobj.private; - - /* - * The swidget parameter of hda_select_dai_widget_ops() is ignored in --- -2.53.0 - diff --git a/queue-6.6/series b/queue-6.6/series index ca3ec569d8..4a349e11c1 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -460,4 +460,3 @@ kvm-reject-wrapped-offset-in-kvm_reset_dirty_gfn.patch kvm-s390-pci-fix-gait-table-indexing-due-to-double-scaling-pointer-arithmetic.patch kvm-x86-fix-xen-hypercall-tracepoint-argument-assignment.patch netfilter-nf_tables-unconditionally-bump-set-nelems-.patch -asoc-sof-intel-hda-fix-null-pointer-dereference.patch