From: Greg Kroah-Hartman Date: Fri, 13 Jan 2023 15:50:00 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.10.163~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1b80410cae29fd8f0b6951d599d3a5b9f407dde;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-hda-hdmi-add-a-hp-device-0x8715-to-force-connect-list.patch alsa-pcm-move-rwsem-lock-inside-snd_ctl_elem_read-to-prevent-uaf.patch --- diff --git a/queue-5.4/alsa-hda-hdmi-add-a-hp-device-0x8715-to-force-connect-list.patch b/queue-5.4/alsa-hda-hdmi-add-a-hp-device-0x8715-to-force-connect-list.patch new file mode 100644 index 00000000000..f2b2c94c8e7 --- /dev/null +++ b/queue-5.4/alsa-hda-hdmi-add-a-hp-device-0x8715-to-force-connect-list.patch @@ -0,0 +1,31 @@ +From de1ccb9e61728dd941fe0e955a7a129418657267 Mon Sep 17 00:00:00 2001 +From: Adrian Chan +Date: Mon, 9 Jan 2023 16:05:20 -0500 +Subject: ALSA: hda/hdmi: Add a HP device 0x8715 to force connect list + +From: Adrian Chan + +commit de1ccb9e61728dd941fe0e955a7a129418657267 upstream. + +Add the 'HP Engage Flex Mini' device to the force connect list to +enable audio through HDMI. + +Signed-off-by: Adrian Chan +Cc: +Link: https://lore.kernel.org/r/20230109210520.16060-1-adchan@google.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_hdmi.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -1821,6 +1821,7 @@ static const struct snd_pci_quirk force_ + SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), ++ SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1), + SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), + {} + }; diff --git a/queue-5.4/alsa-pcm-move-rwsem-lock-inside-snd_ctl_elem_read-to-prevent-uaf.patch b/queue-5.4/alsa-pcm-move-rwsem-lock-inside-snd_ctl_elem_read-to-prevent-uaf.patch new file mode 100644 index 00000000000..b8751009fe6 --- /dev/null +++ b/queue-5.4/alsa-pcm-move-rwsem-lock-inside-snd_ctl_elem_read-to-prevent-uaf.patch @@ -0,0 +1,64 @@ +From 56b88b50565cd8b946a2d00b0c83927b7ebb055e Mon Sep 17 00:00:00 2001 +From: Clement Lecigne +Date: Fri, 13 Jan 2023 13:07:45 +0100 +Subject: ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF + +From: Clement Lecigne + +[ Note: this is a fix that works around the bug equivalently as the + two upstream commits: + 1fa4445f9adf ("ALSA: control - introduce snd_ctl_notify_one() helper") + 56b88b50565c ("ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF") + but in a simpler way to fit with older stable trees -- tiwai ] + +Add missing locking in ctl_elem_read_user/ctl_elem_write_user which can be +easily triggered and turned into an use-after-free. + +Example code paths with SNDRV_CTL_IOCTL_ELEM_READ: + +64-bits: +snd_ctl_ioctl + snd_ctl_elem_read_user + [takes controls_rwsem] + snd_ctl_elem_read [lock properly held, all good] + [drops controls_rwsem] + +32-bits (compat): +snd_ctl_ioctl_compat + snd_ctl_elem_write_read_compat + ctl_elem_write_read + snd_ctl_elem_read [missing lock, not good] + +CVE-2023-0266 was assigned for this issue. + +Signed-off-by: Clement Lecigne +Cc: stable@kernel.org # 5.12 and older +Signed-off-by: Takashi Iwai +Reviewed-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman +--- + sound/core/control_compat.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/sound/core/control_compat.c ++++ b/sound/core/control_compat.c +@@ -306,7 +306,9 @@ static int ctl_elem_read_user(struct snd + err = snd_power_wait(card, SNDRV_CTL_POWER_D0); + if (err < 0) + goto error; ++ down_read(&card->controls_rwsem); + err = snd_ctl_elem_read(card, data); ++ up_read(&card->controls_rwsem); + if (err < 0) + goto error; + err = copy_ctl_value_to_user(userdata, valuep, data, type, count); +@@ -334,7 +336,9 @@ static int ctl_elem_write_user(struct sn + err = snd_power_wait(card, SNDRV_CTL_POWER_D0); + if (err < 0) + goto error; ++ down_write(&card->controls_rwsem); + err = snd_ctl_elem_write(card, file, data); ++ up_write(&card->controls_rwsem); + if (err < 0) + goto error; + err = copy_ctl_value_to_user(userdata, valuep, data, type, count); diff --git a/queue-5.4/series b/queue-5.4/series index 4a921fe2c18..303f23b8fcc 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -601,3 +601,5 @@ selftests-set-the-build-variable-to-absolute-path.patch driver-core-fix-bus_type.match-error-handling-in-__driver_attach.patch net-sched-disallow-noqueue-for-qdisc-classes.patch net-ulp-prevent-ulp-without-clone-op-from-entering-the-listen-status.patch +alsa-pcm-move-rwsem-lock-inside-snd_ctl_elem_read-to-prevent-uaf.patch +alsa-hda-hdmi-add-a-hp-device-0x8715-to-force-connect-list.patch