From: Greg Kroah-Hartman Date: Sun, 17 Oct 2021 10:34:44 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.14.252~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f83ff82047b2a3990fe698a3c3936b985677e61;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: alsa-hda-realtek-add-quirk-for-clevo-x170km-g.patch alsa-hda-realtek-alc236-headset-mic-recording-issue.patch alsa-hda-realtek-complete-partial-device-name-to-avoid-ambiguity.patch alsa-seq-fix-a-potential-uaf-by-wrong-private_free-call-order.patch --- diff --git a/queue-4.19/alsa-hda-realtek-add-quirk-for-clevo-x170km-g.patch b/queue-4.19/alsa-hda-realtek-add-quirk-for-clevo-x170km-g.patch new file mode 100644 index 00000000000..bf02826f7c7 --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-add-quirk-for-clevo-x170km-g.patch @@ -0,0 +1,31 @@ +From cc03069a397005da24f6783835c274d5aedf6043 Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Fri, 1 Oct 2021 15:31:11 +0200 +Subject: ALSA: hda/realtek: Add quirk for Clevo X170KM-G + +From: Werner Sembach + +commit cc03069a397005da24f6783835c274d5aedf6043 upstream. + +This applies a SND_PCI_QUIRK(...) to the Clevo X170KM-G barebone. This +fixes the issue of the devices internal Speaker not working. + +Signed-off-by: Werner Sembach +Cc: +Link: https://lore.kernel.org/r/20211001133111.428249-3-wse@tuxedocomputers.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2524,6 +2524,7 @@ static const struct snd_pci_quirk alc882 + SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170SM", ALC1220_FIXUP_CLEVO_PB51ED_PINS), ++ SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED), + SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x9506, "Clevo P955HQ", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x950a, "Clevo P955H[PR]", ALC1220_FIXUP_CLEVO_P950), diff --git a/queue-4.19/alsa-hda-realtek-alc236-headset-mic-recording-issue.patch b/queue-4.19/alsa-hda-realtek-alc236-headset-mic-recording-issue.patch new file mode 100644 index 00000000000..ebfe5026f10 --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-alc236-headset-mic-recording-issue.patch @@ -0,0 +1,45 @@ +From 5aec98913095ed3b4424ed6c5fdeb6964e9734da Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Tue, 5 Oct 2021 14:35:14 +0800 +Subject: ALSA: hda/realtek - ALC236 headset MIC recording issue + +From: Kailang Yang + +commit 5aec98913095ed3b4424ed6c5fdeb6964e9734da upstream. + +In power save mode, the recording voice from headset mic will 2s more delay. +Add this patch will solve this issue. + +[ minor coding style fix by tiwai ] + +Signed-off-by: Kailang Yang +Tested-by: Kai-Heng Feng +Cc: +Link: https://lore.kernel.org/r/ccb0cdd5bbd7486eabbd8d987d384cb0@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -519,6 +519,8 @@ static void alc_shutup_pins(struct hda_c + struct alc_spec *spec = codec->spec; + + switch (codec->core.vendor_id) { ++ case 0x10ec0236: ++ case 0x10ec0256: + case 0x10ec0283: + case 0x10ec0286: + case 0x10ec0288: +@@ -3365,7 +3367,8 @@ static void alc256_shutup(struct hda_cod + /* If disable 3k pulldown control for alc257, the Mic detection will not work correctly + * when booting with headset plugged. So skip setting it for the codec alc257 + */ +- if (codec->core.vendor_id != 0x10ec0257) ++ if (spec->codec_variant != ALC269_TYPE_ALC257 && ++ spec->codec_variant != ALC269_TYPE_ALC256) + alc_update_coef_idx(codec, 0x46, 0, 3 << 12); + + if (!spec->no_shutup_pins) diff --git a/queue-4.19/alsa-hda-realtek-complete-partial-device-name-to-avoid-ambiguity.patch b/queue-4.19/alsa-hda-realtek-complete-partial-device-name-to-avoid-ambiguity.patch new file mode 100644 index 00000000000..6d8956390d5 --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-complete-partial-device-name-to-avoid-ambiguity.patch @@ -0,0 +1,35 @@ +From 1f8d398e1cd8813f8ec16d55c086e8270a9c18ab Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Fri, 1 Oct 2021 15:31:10 +0200 +Subject: ALSA: hda/realtek: Complete partial device name to avoid ambiguity + +From: Werner Sembach + +commit 1f8d398e1cd8813f8ec16d55c086e8270a9c18ab upstream. + +The string "Clevo X170" is not enough to unambiguously identify the correct +device. + +Fixing it so another Clevo barebone name starting with "X170" can be added +without causing confusion. + +Signed-off-by: Werner Sembach +Cc: +Link: https://lore.kernel.org/r/20211001133111.428249-2-wse@tuxedocomputers.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2523,7 +2523,7 @@ static const struct snd_pci_quirk alc882 + SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), +- SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170", ALC1220_FIXUP_CLEVO_PB51ED_PINS), ++ SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170SM", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x9506, "Clevo P955HQ", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x950a, "Clevo P955H[PR]", ALC1220_FIXUP_CLEVO_P950), diff --git a/queue-4.19/alsa-seq-fix-a-potential-uaf-by-wrong-private_free-call-order.patch b/queue-4.19/alsa-seq-fix-a-potential-uaf-by-wrong-private_free-call-order.patch new file mode 100644 index 00000000000..baa354f12fb --- /dev/null +++ b/queue-4.19/alsa-seq-fix-a-potential-uaf-by-wrong-private_free-call-order.patch @@ -0,0 +1,59 @@ +From 1f8763c59c4ec6254d629fe77c0a52220bd907aa Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 30 Sep 2021 13:41:14 +0200 +Subject: ALSA: seq: Fix a potential UAF by wrong private_free call order + +From: Takashi Iwai + +commit 1f8763c59c4ec6254d629fe77c0a52220bd907aa upstream. + +John Keeping reported and posted a patch for a potential UAF in +rawmidi sequencer destruction: the snd_rawmidi_dev_seq_free() may be +called after the associated rawmidi object got already freed. +After a deeper look, it turned out that the bug is rather the +incorrect private_free call order for a snd_seq_device. The +snd_seq_device private_free gets called at the release callback of the +sequencer device object, while this was rather expected to be executed +at the snd_device call chains that runs at the beginning of the whole +card-free procedure. It's been broken since the rewrite of +sequencer-device binding (although it hasn't surfaced because the +sequencer device release happens usually right along with the card +device release). + +This patch corrects the private_free call to be done in the right +place, at snd_seq_device_dev_free(). + +Fixes: 7c37ae5c625a ("ALSA: seq: Rewrite sequencer device binding with standard bus") +Reported-and-tested-by: John Keeping +Cc: +Link: https://lore.kernel.org/r/20210930114114.8645-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/core/seq_device.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +--- a/sound/core/seq_device.c ++++ b/sound/core/seq_device.c +@@ -162,6 +162,8 @@ static int snd_seq_device_dev_free(struc + struct snd_seq_device *dev = device->device_data; + + cancel_autoload_drivers(); ++ if (dev->private_free) ++ dev->private_free(dev); + put_device(&dev->dev); + return 0; + } +@@ -189,11 +191,7 @@ static int snd_seq_device_dev_disconnect + + static void snd_seq_dev_release(struct device *dev) + { +- struct snd_seq_device *sdev = to_seq_dev(dev); +- +- if (sdev->private_free) +- sdev->private_free(sdev); +- kfree(sdev); ++ kfree(to_seq_dev(dev)); + } + + /*