]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.13-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Apr 2025 19:52:19 +0000 (20:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Apr 2025 19:52:19 +0000 (20:52 +0100)
added patches:
alsa-hda-realtek-bass-speaker-fixup-for-asus-um5606ka.patch
alsa-hda-realtek-support-mute-led-on-hp-laptop-15s-du3xxx.patch
netfilter-socket-lookup-orig-tuple-for-ipv6-snat.patch

queue-6.13/alsa-hda-realtek-bass-speaker-fixup-for-asus-um5606ka.patch [new file with mode: 0644]
queue-6.13/alsa-hda-realtek-support-mute-led-on-hp-laptop-15s-du3xxx.patch [new file with mode: 0644]
queue-6.13/netfilter-socket-lookup-orig-tuple-for-ipv6-snat.patch [new file with mode: 0644]
queue-6.13/series

diff --git a/queue-6.13/alsa-hda-realtek-bass-speaker-fixup-for-asus-um5606ka.patch b/queue-6.13/alsa-hda-realtek-bass-speaker-fixup-for-asus-um5606ka.patch
new file mode 100644 (file)
index 0000000..70af2ca
--- /dev/null
@@ -0,0 +1,38 @@
+From be8cd366beb80c709adbc7688ee72750f5aee3ff Mon Sep 17 00:00:00 2001
+From: Andres Traumann <andres.traumann.01@gmail.com>
+Date: Tue, 25 Mar 2025 17:25:35 +0700
+Subject: ALSA: hda/realtek: Bass speaker fixup for ASUS UM5606KA
+
+From: Andres Traumann <andres.traumann.01@gmail.com>
+
+commit be8cd366beb80c709adbc7688ee72750f5aee3ff upstream.
+
+This patch applies the ALC294 bass speaker fixup (ALC294_FIXUP_BASS_SPEAKER_15),
+previously introduced in commit a7df7f909cec ("ALSA: hda: improve bass
+speaker support for ASUS Zenbook UM5606WA"), to the ASUS Zenbook UM5606KA.
+This hardware configuration matches ASUS Zenbook UM5606WA, where DAC NID
+0x06 was removed from the bass speaker (NID 0x15), routing both speaker
+pins to DAC NID 0x03.
+
+This resolves the bass speaker routing issue, ensuring correct audio
+output on ASUS UM5606KA.
+
+Signed-off-by: Andres Traumann <andres.traumann.01@gmail.com>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20250325102535.8172-1-andres.traumann.01@gmail.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -10730,6 +10730,7 @@ static const struct hda_quirk alc269_fix
+       SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),
+       SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2),
+       SND_PCI_QUIRK(0x1043, 0x1df3, "ASUS UM5606WA", ALC294_FIXUP_BASS_SPEAKER_15),
++      SND_PCI_QUIRK(0x1043, 0x1264, "ASUS UM5606KA", ALC294_FIXUP_BASS_SPEAKER_15),
+       SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),
+       SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
+       SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
diff --git a/queue-6.13/alsa-hda-realtek-support-mute-led-on-hp-laptop-15s-du3xxx.patch b/queue-6.13/alsa-hda-realtek-support-mute-led-on-hp-laptop-15s-du3xxx.patch
new file mode 100644 (file)
index 0000000..b945e4f
--- /dev/null
@@ -0,0 +1,33 @@
+From 35ef1c79d2e09e9e5a66e28a66fe0df4368b0f3d Mon Sep 17 00:00:00 2001
+From: Dhruv Deshpande <dhrv.d@proton.me>
+Date: Mon, 17 Mar 2025 08:56:53 +0000
+Subject: ALSA: hda/realtek: Support mute LED on HP Laptop 15s-du3xxx
+
+From: Dhruv Deshpande <dhrv.d@proton.me>
+
+commit 35ef1c79d2e09e9e5a66e28a66fe0df4368b0f3d upstream.
+
+The mute LED on this HP laptop uses ALC236 and requires a quirk to function.
+This patch enables the existing quirk for the device.
+
+Tested on my laptop and the LED behaviour works as intended.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Dhruv Deshpande <dhrv.d@proton.me>
+Link: https://patch.msgid.link/20250317085621.45056-1-dhrv.d@proton.me
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -10472,6 +10472,7 @@ static const struct hda_quirk alc269_fix
+       SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+       SND_PCI_QUIRK(0x103c, 0x8812, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+       SND_PCI_QUIRK(0x103c, 0x881d, "HP 250 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
++      SND_PCI_QUIRK(0x103c, 0x881e, "HP Laptop 15s-du3xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+       SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
+       SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
+       SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
diff --git a/queue-6.13/netfilter-socket-lookup-orig-tuple-for-ipv6-snat.patch b/queue-6.13/netfilter-socket-lookup-orig-tuple-for-ipv6-snat.patch
new file mode 100644 (file)
index 0000000..e6881d2
--- /dev/null
@@ -0,0 +1,75 @@
+From 932b32ffd7604fb00b5c57e239a3cc4d901ccf6e Mon Sep 17 00:00:00 2001
+From: Maxim Mikityanskiy <maxtram95@gmail.com>
+Date: Tue, 18 Mar 2025 18:15:16 +0200
+Subject: netfilter: socket: Lookup orig tuple for IPv6 SNAT
+
+From: Maxim Mikityanskiy <maxtram95@gmail.com>
+
+commit 932b32ffd7604fb00b5c57e239a3cc4d901ccf6e upstream.
+
+nf_sk_lookup_slow_v4 does the conntrack lookup for IPv4 packets to
+restore the original 5-tuple in case of SNAT, to be able to find the
+right socket (if any). Then socket_match() can correctly check whether
+the socket was transparent.
+
+However, the IPv6 counterpart (nf_sk_lookup_slow_v6) lacks this
+conntrack lookup, making xt_socket fail to match on the socket when the
+packet was SNATed. Add the same logic to nf_sk_lookup_slow_v6.
+
+IPv6 SNAT is used in Kubernetes clusters for pod-to-world packets, as
+pods' addresses are in the fd00::/8 ULA subnet and need to be replaced
+with the node's external address. Cilium leverages Envoy to enforce L7
+policies, and Envoy uses transparent sockets. Cilium inserts an iptables
+prerouting rule that matches on `-m socket --transparent` and redirects
+the packets to localhost, but it fails to match SNATed IPv6 packets due
+to that missing conntrack lookup.
+
+Closes: https://github.com/cilium/cilium/issues/37932
+Fixes: eb31628e37a0 ("netfilter: nf_tables: Add support for IPv6 NAT")
+Signed-off-by: Maxim Mikityanskiy <maxim@isovalent.com>
+Reviewed-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/ipv6/netfilter/nf_socket_ipv6.c |   23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+--- a/net/ipv6/netfilter/nf_socket_ipv6.c
++++ b/net/ipv6/netfilter/nf_socket_ipv6.c
+@@ -103,6 +103,10 @@ struct sock *nf_sk_lookup_slow_v6(struct
+       struct sk_buff *data_skb = NULL;
+       int doff = 0;
+       int thoff = 0, tproto;
++#if IS_ENABLED(CONFIG_NF_CONNTRACK)
++      enum ip_conntrack_info ctinfo;
++      struct nf_conn const *ct;
++#endif
+       tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL);
+       if (tproto < 0) {
+@@ -136,6 +140,25 @@ struct sock *nf_sk_lookup_slow_v6(struct
+               return NULL;
+       }
++#if IS_ENABLED(CONFIG_NF_CONNTRACK)
++      /* Do the lookup with the original socket address in
++       * case this is a reply packet of an established
++       * SNAT-ted connection.
++       */
++      ct = nf_ct_get(skb, &ctinfo);
++      if (ct &&
++          ((tproto != IPPROTO_ICMPV6 &&
++            ctinfo == IP_CT_ESTABLISHED_REPLY) ||
++           (tproto == IPPROTO_ICMPV6 &&
++            ctinfo == IP_CT_RELATED_REPLY)) &&
++          (ct->status & IPS_SRC_NAT_DONE)) {
++              daddr = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.in6;
++              dport = (tproto == IPPROTO_TCP) ?
++                      ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.tcp.port :
++                      ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port;
++      }
++#endif
++
+       return nf_socket_get_sock_v6(net, data_skb, doff, tproto, saddr, daddr,
+                                    sport, dport, indev);
+ }
index d2e00fd2dae50a1bfc700fb14361dec1fb18425c..92a65894e1278a99e21b4c7ad5a324f44f8d3500 100644 (file)
@@ -3,3 +3,6 @@ hid-hid-plantronics-add-mic-mute-mapping-and-generalize-quirks.patch
 atm-fix-null-pointer-dereference.patch
 nfsd-fix-legacy-client-tracking-initialization.patch
 cgroup-rstat-fix-forceidle-time-in-cpu.stat.patch
+netfilter-socket-lookup-orig-tuple-for-ipv6-snat.patch
+alsa-hda-realtek-support-mute-led-on-hp-laptop-15s-du3xxx.patch
+alsa-hda-realtek-bass-speaker-fixup-for-asus-um5606ka.patch