public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH for-stable] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
@ 2022-04-02 16:30 Ammar Faizi
  2022-04-02 16:31 ` [PATCH linux-5.4.y] " Ammar Faizi
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Ammar Faizi @ 2022-04-02 16:30 UTC (permalink / raw)
  To: stable, Greg Kroah-Hartman
  Cc: Ammar Faizi, Daniel Baluta, Jaroslav Kysela, Kai Vehmanen,
	Keyon Jie, Liam Girdwood, Peter Ujfalusi, Pierre-Louis Bossart,
	Rander Wang, Ranjani Sridharan, Takashi Iwai, sound-open-firmware,
	alsa-devel, linux-kernel, gwml


Hello Greg,

commit b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 upstream.

Please take these two backport patches:
1. For Linux 5.4 LTS.
2. For Linux 5.10 LTS.

Both will be sent as a reply to this email.

Thank you!

=====

5.4 failed report:
https://lore.kernel.org/stable/[email protected]/


5.10 failed report:
https://lore.kernel.org/stable/[email protected]/

-- 
Ammar Faizi


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH linux-5.4.y] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
  2022-04-02 16:30 [PATCH for-stable] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM Ammar Faizi
@ 2022-04-02 16:31 ` Ammar Faizi
  2022-04-02 16:32 ` [PATCH linux-5.10.y] " Ammar Faizi
  2022-04-03 10:24 ` [PATCH for-stable] " Greg Kroah-Hartman
  2 siblings, 0 replies; 4+ messages in thread
From: Ammar Faizi @ 2022-04-02 16:31 UTC (permalink / raw)
  To: stable, Greg Kroah-Hartman
  Cc: Ammar Faizi, Daniel Baluta, Jaroslav Kysela, Kai Vehmanen,
	Keyon Jie, Liam Girdwood, Peter Ujfalusi, Pierre-Louis Bossart,
	Rander Wang, Ranjani Sridharan, Takashi Iwai, sound-open-firmware,
	alsa-devel, linux-kernel, gwml, Mark Brown

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]  <TASK>
  [ T1387]  cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1]
  [... snip ...]
  [ T1387]  </TASK>

Cc: Daniel Baluta <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Kai Vehmanen <[email protected]>
Cc: Keyon Jie <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Rander Wang <[email protected]>
Cc: Ranjani Sridharan <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected] # v5.2+
Fixes: d16046ffa6de040bf580a64d5f4d0aa18258a854 ("ASoC: SOF: Intel: Add Intel specific HDA firmware loader")
Link: https://lore.kernel.org/lkml/[email protected]/ # v1
Link: https://lore.kernel.org/lkml/[email protected]/ # v2
Link: https://lore.kernel.org/lkml/[email protected]/ # v3
Reviewed-by: Peter Ujfalusi <[email protected]>
Reviewed-by: Pierre-Louis Bossart <[email protected]>
Signed-off-by: Ammar Faizi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
[ammarfaizi2: Backport to Linux 5.4 LTS]
Signed-off-by: Ammar Faizi <[email protected]>
---
 sound/soc/sof/intel/hda-loader.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 356bb134ae93..7573f3f9f0f2 100644
--- 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_sof_dev *sdev, unsigned int format,
 	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_sof_dev *sdev, unsigned int format,
 	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;
 }
 

base-commit: 2845ff3fd34499603249676495c524a35e795b45
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH linux-5.10.y] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
  2022-04-02 16:30 [PATCH for-stable] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM Ammar Faizi
  2022-04-02 16:31 ` [PATCH linux-5.4.y] " Ammar Faizi
@ 2022-04-02 16:32 ` Ammar Faizi
  2022-04-03 10:24 ` [PATCH for-stable] " Greg Kroah-Hartman
  2 siblings, 0 replies; 4+ messages in thread
From: Ammar Faizi @ 2022-04-02 16:32 UTC (permalink / raw)
  To: stable, Greg Kroah-Hartman
  Cc: Ammar Faizi, Daniel Baluta, Jaroslav Kysela, Kai Vehmanen,
	Keyon Jie, Liam Girdwood, Peter Ujfalusi, Pierre-Louis Bossart,
	Rander Wang, Ranjani Sridharan, Takashi Iwai, sound-open-firmware,
	alsa-devel, linux-kernel, gwml, Mark Brown

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]  <TASK>
  [ T1387]  cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1]
  [... snip ...]
  [ T1387]  </TASK>

Cc: Daniel Baluta <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Kai Vehmanen <[email protected]>
Cc: Keyon Jie <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Rander Wang <[email protected]>
Cc: Ranjani Sridharan <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected] # v5.2+
Fixes: d16046ffa6de040bf580a64d5f4d0aa18258a854 ("ASoC: SOF: Intel: Add Intel specific HDA firmware loader")
Link: https://lore.kernel.org/lkml/[email protected]/ # v1
Link: https://lore.kernel.org/lkml/[email protected]/ # v2
Link: https://lore.kernel.org/lkml/[email protected]/ # v3
Reviewed-by: Peter Ujfalusi <[email protected]>
Reviewed-by: Pierre-Louis Bossart <[email protected]>
Signed-off-by: Ammar Faizi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
[ammarfaizi2: Backport to Linux 5.10 LTS]
Signed-off-by: Ammar Faizi <[email protected]>
---
 sound/soc/sof/intel/hda-loader.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 2707a16c6a4d..347636a80b48 100644
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -47,7 +47,7 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig
 	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 */
@@ -58,22 +58,23 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig
 		ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL);
 		if (ret < 0) {
 			dev_err(sdev->dev, "error: iccmax stream prepare failed: %x\n", ret);
-			goto error;
+			goto out_free;
 		}
 	} else {
 		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 dsp_stream;
 
-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 ERR_PTR(ret);
 }
 

base-commit: d9c5818a0bc09e4cc9fe663edb69e4d6cdae4f70
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH for-stable] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
  2022-04-02 16:30 [PATCH for-stable] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM Ammar Faizi
  2022-04-02 16:31 ` [PATCH linux-5.4.y] " Ammar Faizi
  2022-04-02 16:32 ` [PATCH linux-5.10.y] " Ammar Faizi
@ 2022-04-03 10:24 ` Greg Kroah-Hartman
  2 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2022-04-03 10:24 UTC (permalink / raw)
  To: Ammar Faizi
  Cc: stable, Daniel Baluta, Jaroslav Kysela, Kai Vehmanen, Keyon Jie,
	Liam Girdwood, Peter Ujfalusi, Pierre-Louis Bossart, Rander Wang,
	Ranjani Sridharan, Takashi Iwai, sound-open-firmware, alsa-devel,
	linux-kernel, gwml

On Sat, Apr 02, 2022 at 11:30:26PM +0700, Ammar Faizi wrote:
> 
> Hello Greg,
> 
> commit b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 upstream.
> 
> Please take these two backport patches:
> 1. For Linux 5.4 LTS.
> 2. For Linux 5.10 LTS.
> 
> Both will be sent as a reply to this email.
> 
> Thank you!
> 
> =====
> 
> 5.4 failed report:
> https://lore.kernel.org/stable/[email protected]/
> 
> 
> 5.10 failed report:
> https://lore.kernel.org/stable/[email protected]/
> 
> -- 
> Ammar Faizi
> 

Both now queued up, thanks!

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-04-03 10:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-02 16:30 [PATCH for-stable] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM Ammar Faizi
2022-04-02 16:31 ` [PATCH linux-5.4.y] " Ammar Faizi
2022-04-02 16:32 ` [PATCH linux-5.10.y] " Ammar Faizi
2022-04-03 10:24 ` [PATCH for-stable] " Greg Kroah-Hartman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox