From: Greg Kroah-Hartman Date: Sat, 6 Sep 2025 18:33:42 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.4.299~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7baea79079d214ef1f61444f76a141bdb11dfd6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-some-devices.patch pcmcia-fix-a-null-pointer-dereference-in-__iodyn_find_io_region.patch --- diff --git a/queue-5.4/alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-some-devices.patch b/queue-5.4/alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-some-devices.patch new file mode 100644 index 0000000000..1a882f6d42 --- /dev/null +++ b/queue-5.4/alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-some-devices.patch @@ -0,0 +1,37 @@ +From 9c6182843b0d02ca04cc1d946954a65a2286c7db Mon Sep 17 00:00:00 2001 +From: Cryolitia PukNgae +Date: Fri, 22 Aug 2025 20:58:08 +0800 +Subject: ALSA: usb-audio: Add mute TLV for playback volumes on some devices + +From: Cryolitia PukNgae + +commit 9c6182843b0d02ca04cc1d946954a65a2286c7db upstream. + +Applying the quirk of that, the lowest Playback mixer volume setting +mutes the audio output, on more devices. + +Link: https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2514 +Cc: +Tested-by: Guoli An +Signed-off-by: Cryolitia PukNgae +Link: https://patch.msgid.link/20250822-mixer-quirk-v1-1-b19252239c1c@uniontech.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/mixer_quirks.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/usb/mixer_quirks.c ++++ b/sound/usb/mixer_quirks.c +@@ -2587,9 +2587,11 @@ void snd_usb_mixer_fu_apply_quirk(struct + snd_dragonfly_quirk_db_scale(mixer, cval, kctl); + break; + /* lowest playback value is muted on some devices */ ++ case USB_ID(0x0572, 0x1b09): /* Conexant Systems (Rockwell), Inc. */ + case USB_ID(0x0d8c, 0x000c): /* C-Media */ + case USB_ID(0x0d8c, 0x0014): /* C-Media */ + case USB_ID(0x19f7, 0x0003): /* RODE NT-USB */ ++ case USB_ID(0x2d99, 0x0026): /* HECATE G2 GAMING HEADSET */ + if (strstr(kctl->id.name, "Playback")) + cval->min_mute = 1; + break; diff --git a/queue-5.4/pcmcia-fix-a-null-pointer-dereference-in-__iodyn_find_io_region.patch b/queue-5.4/pcmcia-fix-a-null-pointer-dereference-in-__iodyn_find_io_region.patch new file mode 100644 index 0000000000..bef4d65120 --- /dev/null +++ b/queue-5.4/pcmcia-fix-a-null-pointer-dereference-in-__iodyn_find_io_region.patch @@ -0,0 +1,37 @@ +From 44822df89e8f3386871d9cad563ece8e2fd8f0e7 Mon Sep 17 00:00:00 2001 +From: Ma Ke +Date: Tue, 12 Aug 2025 15:25:09 +0800 +Subject: pcmcia: Fix a NULL pointer dereference in __iodyn_find_io_region() + +From: Ma Ke + +commit 44822df89e8f3386871d9cad563ece8e2fd8f0e7 upstream. + +In __iodyn_find_io_region(), pcmcia_make_resource() is assigned to +res and used in pci_bus_alloc_resource(). There is a dereference of res +in pci_bus_alloc_resource(), which could lead to a NULL pointer +dereference on failure of pcmcia_make_resource(). + +Fix this bug by adding a check of res. + +Cc: stable@vger.kernel.org +Fixes: 49b1153adfe1 ("pcmcia: move all pcmcia_resource_ops providers into one module") +Signed-off-by: Ma Ke +Signed-off-by: Dominik Brodowski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pcmcia/rsrc_iodyn.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/pcmcia/rsrc_iodyn.c ++++ b/drivers/pcmcia/rsrc_iodyn.c +@@ -62,6 +62,9 @@ static struct resource *__iodyn_find_io_ + unsigned long min = base; + int ret; + ++ if (!res) ++ return NULL; ++ + data.mask = align - 1; + data.offset = base & data.mask; + diff --git a/queue-5.4/series b/queue-5.4/series index a36333d3e4..22f3845fdf 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -15,3 +15,5 @@ ipv4-fix-null-vs-error-pointer-check-in-inet_blackho.patch ax25-properly-unshare-skbs-in-ax25_kiss_rcv.patch net-atm-fix-memory-leak-in-atm_register_sysfs-when-d.patch ppp-fix-memory-leak-in-pad_compress_skb.patch +alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-some-devices.patch +pcmcia-fix-a-null-pointer-dereference-in-__iodyn_find_io_region.patch