From: Greg Kroah-Hartman Date: Sun, 3 Apr 2022 10:24:37 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.17.2~152 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74c7732a07146d7337c2da9375e28b641089163f;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: asoc-sof-intel-fix-null-ptr-dereference-when-enomem.patch --- diff --git a/queue-5.4/asoc-sof-intel-fix-null-ptr-dereference-when-enomem.patch b/queue-5.4/asoc-sof-intel-fix-null-ptr-dereference-when-enomem.patch new file mode 100644 index 00000000000..afff775ce55 --- /dev/null +++ b/queue-5.4/asoc-sof-intel-fix-null-ptr-dereference-when-enomem.patch @@ -0,0 +1,101 @@ +From b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 Mon Sep 17 00:00:00 2001 +From: Ammar Faizi +Date: Fri, 25 Feb 2022 01:58:36 +0700 +Subject: ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM + +From: Ammar Faizi + +commit b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 upstream. + +Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns +-ENOMEM because it leads to a NULL pointer dereference bug. + +The dmesg says: + + [ T1387] sof-audio-pci-intel-tgl 0000:00:1f.3: error: memory alloc failed: -12 + [ T1387] BUG: kernel NULL pointer dereference, address: 0000000000000000 + [ T1387] #PF: supervisor read access in kernel mode + [ T1387] #PF: error_code(0x0000) - not-present page + [ T1387] PGD 0 P4D 0 + [ T1387] Oops: 0000 [#1] PREEMPT SMP NOPTI + [ T1387] CPU: 6 PID: 1387 Comm: alsa-sink-HDA A Tainted: G W 5.17.0-rc4-superb-owl-00055-g80d47f5de5e3 + [ T1387] Hardware name: HP HP Laptop 14s-dq2xxx/87FD, BIOS F.15 09/15/2021 + [ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80 + [ T1387] Code: [... snip ...] + [ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246 + [ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 + [ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0 + [ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000 + [ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001 + [ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828 + [ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000 + [ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + [ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0 + [ T1387] PKRU: 55555554 + [ T1387] Call Trace: + [ T1387] + [ T1387] cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] + [... snip ...] + [ T1387] + +Cc: Daniel Baluta +Cc: Jaroslav Kysela +Cc: Kai Vehmanen +Cc: Keyon Jie +Cc: Liam Girdwood +Cc: Mark Brown +Cc: Rander Wang +Cc: Ranjani Sridharan +Cc: Takashi Iwai +Cc: sound-open-firmware@alsa-project.org +Cc: alsa-devel@alsa-project.org +Cc: linux-kernel@vger.kernel.org +Cc: stable@vger.kernel.org # v5.2+ +Fixes: d16046ffa6de040bf580a64d5f4d0aa18258a854 ("ASoC: SOF: Intel: Add Intel specific HDA firmware loader") +Link: https://lore.kernel.org/lkml/20220224145124.15985-1-ammarfaizi2@gnuweeb.org/ # v1 +Link: https://lore.kernel.org/lkml/20220224180850.34592-1-ammarfaizi2@gnuweeb.org/ # v2 +Link: https://lore.kernel.org/lkml/20220224182818.40301-1-ammarfaizi2@gnuweeb.org/ # v3 +Reviewed-by: Peter Ujfalusi +Reviewed-by: Pierre-Louis Bossart +Signed-off-by: Ammar Faizi +Link: https://lore.kernel.org/r/20220224185836.44907-1-ammarfaizi2@gnuweeb.org +Signed-off-by: Mark Brown +[ammarfaizi2: Backport to Linux 5.4 LTS] +Signed-off-by: Ammar Faizi +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/sof/intel/hda-loader.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/sound/soc/sof/intel/hda-loader.c ++++ b/sound/soc/sof/intel/hda-loader.c +@@ -50,7 +50,7 @@ static int cl_stream_prepare(struct snd_ + ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV_SG, &pci->dev, size, dmab); + if (ret < 0) { + dev_err(sdev->dev, "error: memory alloc failed: %x\n", ret); +- goto error; ++ goto out_put; + } + + hstream->period_bytes = 0;/* initialize period_bytes */ +@@ -60,16 +60,17 @@ static int cl_stream_prepare(struct snd_ + ret = hda_dsp_stream_hw_params(sdev, dsp_stream, dmab, NULL); + if (ret < 0) { + dev_err(sdev->dev, "error: hdac prepare failed: %x\n", ret); +- goto error; ++ goto out_free; + } + + hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size); + + return hstream->stream_tag; + +-error: +- hda_dsp_stream_put(sdev, direction, hstream->stream_tag); ++out_free: + snd_dma_free_pages(dmab); ++out_put: ++ hda_dsp_stream_put(sdev, direction, hstream->stream_tag); + return ret; + } + diff --git a/queue-5.4/series b/queue-5.4/series index 73d41cc2467..205f3ea520d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -330,3 +330,4 @@ scsi-qla2xxx-reduce-false-trigger-to-login.patch scsi-qla2xxx-use-correct-feature-type-field-during-rff_id-processing.patch kvm-prevent-module-exit-until-all-vms-are-freed.patch kvm-x86-fix-sending-pv-ipi.patch +asoc-sof-intel-fix-null-ptr-dereference-when-enomem.patch