This is a note to let you know that I've just added the patch titled
Revert "ALSA: hda: Fix page fault in snd_hda_codec_shutdown()"
to the 5.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-alsa-hda-fix-page-fault-in-snd_hda_codec_shutdown.patch
and it can be found in the queue-5.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 53f07e9b010b966017e32be1ca1bbcbcc4cee73d Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri, 15 Jul 2022 20:29:03 +0200
Subject: Revert "ALSA: hda: Fix page fault in snd_hda_codec_shutdown()"
From: Takashi Iwai <tiwai@xxxxxxx>
commit 53f07e9b010b966017e32be1ca1bbcbcc4cee73d upstream.
This reverts commit 980b3a8790b402e959a6d773b38b771019682be1.
The commit didn't consider the fact that ASoC hdac-hda driver
initializes the HD-audio stuff without calling
snd_hda_codec_device_init(). Hence this caused a regression leading
to Oops.
Revert the commit to restore the behavior.
Fixes: 980b3a8790b4 ("ALSA: hda: Fix page fault in snd_hda_codec_shutdown()")
Link: https://lore.kernel.org/r/3c40df55-3aee-1e08-493b-7b30cd84dc00@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20220715182903.19594-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/hda_codec.c | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -931,28 +931,8 @@ snd_hda_codec_device_init(struct hda_bus
}
codec->bus = bus;
- codec->depop_delay = -1;
- codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
- codec->core.dev.release = snd_hda_codec_dev_release;
- codec->core.exec_verb = codec_exec_verb;
codec->core.type = HDA_DEV_LEGACY;
- mutex_init(&codec->spdif_mutex);
- mutex_init(&codec->control_mutex);
- snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32);
- snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32);
- snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
- snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
- snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8);
- snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16);
- snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16);
- snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8);
- INIT_LIST_HEAD(&codec->conn_list);
- INIT_LIST_HEAD(&codec->pcm_list_head);
- INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
- refcount_set(&codec->pcm_ref, 1);
- init_waitqueue_head(&codec->remove_sleep);
-
return codec;
}
EXPORT_SYMBOL_GPL(snd_hda_codec_device_init);
@@ -1000,8 +980,29 @@ int snd_hda_codec_device_new(struct hda_
if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
return -EINVAL;
+ codec->core.dev.release = snd_hda_codec_dev_release;
+ codec->core.exec_verb = codec_exec_verb;
+
codec->card = card;
codec->addr = codec_addr;
+ mutex_init(&codec->spdif_mutex);
+ mutex_init(&codec->control_mutex);
+ snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32);
+ snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32);
+ snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
+ snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
+ snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8);
+ snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16);
+ snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16);
+ snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8);
+ INIT_LIST_HEAD(&codec->conn_list);
+ INIT_LIST_HEAD(&codec->pcm_list_head);
+ refcount_set(&codec->pcm_ref, 1);
+ init_waitqueue_head(&codec->remove_sleep);
+
+ INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
+ codec->depop_delay = -1;
+ codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
#ifdef CONFIG_PM
codec->power_jiffies = jiffies;
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-5.19/asoc-sof-debug-fix-potential-buffer-overflow-by-snprintf.patch
queue-5.19/alsa-control-use-deferred-fasync-helper.patch
queue-5.19/alsa-info-fix-llseek-return-value-when-using-callback.patch
queue-5.19/alsa-usb-audio-more-comprehensive-mixer-map-for-asus-rog-zenith-ii.patch
queue-5.19/asoc-dpcm-don-t-pick-up-be-without-substream.patch
queue-5.19/alsa-core-add-async-signal-helpers.patch
queue-5.19/asoc-sof-intel-hda-fix-potential-buffer-overflow-by-snprintf.patch
queue-5.19/alsa-hda-realtek-add-quirk-for-clevo-ns50pu-ns70pu.patch
queue-5.19/alsa-timer-use-deferred-fasync-helper.patch
queue-5.19/alsa-hda-fix-crash-due-to-jack-poll-in-suspend.patch
queue-5.19/alsa-hda-fix-page-fault-in-snd_hda_codec_shutdown.patch
queue-5.19/alsa-pcm-use-deferred-fasync-helper.patch
queue-5.19/revert-alsa-hda-fix-page-fault-in-snd_hda_codec_shutdown.patch
queue-5.19/asoc-intel-avs-fix-potential-buffer-overflow-by-snprintf.patch
queue-5.19/asoc-intel-avs-set-max-dma-segment-size.patch
queue-5.19/alsa-hda-realtek-enable-speaker-and-mute-leds-for-hp.patch
