From: Greg Kroah-Hartman Date: Tue, 20 May 2025 11:21:03 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.15.184~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b01deb5e301bc3c6206b120877125ebd89d66786;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: input-synaptics-enable-intertouch-on-tuxedo-infinitybook-pro-14-v5.patch input-synaptics-enable-smbus-for-hp-elitebook-850-g1.patch openvswitch-fix-unsafe-attribute-parsing-in-output_userspace.patch --- diff --git a/queue-5.4/input-synaptics-enable-intertouch-on-tuxedo-infinitybook-pro-14-v5.patch b/queue-5.4/input-synaptics-enable-intertouch-on-tuxedo-infinitybook-pro-14-v5.patch new file mode 100644 index 0000000000..deaa1ef14c --- /dev/null +++ b/queue-5.4/input-synaptics-enable-intertouch-on-tuxedo-infinitybook-pro-14-v5.patch @@ -0,0 +1,36 @@ +From 2abc698ac77314e0de5b33a6d96a39c5159d88e4 Mon Sep 17 00:00:00 2001 +From: Aditya Garg +Date: Wed, 7 May 2025 12:09:00 -0700 +Subject: Input: synaptics - enable InterTouch on TUXEDO InfinityBook Pro 14 v5 + +From: Aditya Garg + +commit 2abc698ac77314e0de5b33a6d96a39c5159d88e4 upstream. + +Enable InterTouch mode on TUXEDO InfinityBook Pro 14 v5 by adding +"SYN1221" to the list of SMBus-enabled variants. + +Add support for InterTouch on SYN1221 by adding it to the list of +SMBus-enabled variants. + +Reported-by: Matthias Eilert +Tested-by: Matthias Eilert +Signed-off-by: Aditya Garg +Link: https://lore.kernel.org/r/PN3PR01MB9597C033C4BC20EE2A0C4543B888A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -186,6 +186,7 @@ static const char * const smbus_pnp_ids[ + "LEN2044", /* L470 */ + "LEN2054", /* E480 */ + "LEN2055", /* E580 */ ++ "SYN1221", /* TUXEDO InfinityBook Pro 14 v5 */ + "SYN3003", /* HP EliteBook 850 G1 */ + "SYN3052", /* HP EliteBook 840 G4 */ + "SYN3221", /* HP 15-ay000 */ diff --git a/queue-5.4/input-synaptics-enable-smbus-for-hp-elitebook-850-g1.patch b/queue-5.4/input-synaptics-enable-smbus-for-hp-elitebook-850-g1.patch new file mode 100644 index 0000000000..9897d3147c --- /dev/null +++ b/queue-5.4/input-synaptics-enable-smbus-for-hp-elitebook-850-g1.patch @@ -0,0 +1,32 @@ +From f04f03d3e99bc8f89b6af5debf07ff67d961bc23 Mon Sep 17 00:00:00 2001 +From: Dmitry Torokhov +Date: Wed, 7 May 2025 14:52:55 -0700 +Subject: Input: synaptics - enable SMBus for HP Elitebook 850 G1 + +From: Dmitry Torokhov + +commit f04f03d3e99bc8f89b6af5debf07ff67d961bc23 upstream. + +The kernel reports that the touchpad for this device can support +SMBus mode. + +Reported-by: jt +Link: https://lore.kernel.org/r/iys5dbv3ldddsgobfkxldazxyp54kay4bozzmagga6emy45jop@2ebvuxgaui4u +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Aditya Garg +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -186,6 +186,7 @@ static const char * const smbus_pnp_ids[ + "LEN2044", /* L470 */ + "LEN2054", /* E480 */ + "LEN2055", /* E580 */ ++ "SYN3003", /* HP EliteBook 850 G1 */ + "SYN3052", /* HP EliteBook 840 G4 */ + "SYN3221", /* HP 15-ay000 */ + "SYN323d", /* HP Spectre X360 13-w013dx */ diff --git a/queue-5.4/openvswitch-fix-unsafe-attribute-parsing-in-output_userspace.patch b/queue-5.4/openvswitch-fix-unsafe-attribute-parsing-in-output_userspace.patch new file mode 100644 index 0000000000..3897b652e1 --- /dev/null +++ b/queue-5.4/openvswitch-fix-unsafe-attribute-parsing-in-output_userspace.patch @@ -0,0 +1,36 @@ +From 6beb6835c1fbb3f676aebb51a5fee6b77fed9308 Mon Sep 17 00:00:00 2001 +From: Eelco Chaudron +Date: Tue, 6 May 2025 16:28:54 +0200 +Subject: openvswitch: Fix unsafe attribute parsing in output_userspace() + +From: Eelco Chaudron + +commit 6beb6835c1fbb3f676aebb51a5fee6b77fed9308 upstream. + +This patch replaces the manual Netlink attribute iteration in +output_userspace() with nla_for_each_nested(), which ensures that only +well-formed attributes are processed. + +Fixes: ccb1352e76cf ("net: Add Open vSwitch kernel components.") +Signed-off-by: Eelco Chaudron +Acked-by: Ilya Maximets +Acked-by: Aaron Conole +Link: https://patch.msgid.link/0bd65949df61591d9171c0dc13e42cea8941da10.1746541734.git.echaudro@redhat.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/openvswitch/actions.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/net/openvswitch/actions.c ++++ b/net/openvswitch/actions.c +@@ -967,8 +967,7 @@ static int output_userspace(struct datap + upcall.cmd = OVS_PACKET_CMD_ACTION; + upcall.mru = OVS_CB(skb)->mru; + +- for (a = nla_data(attr), rem = nla_len(attr); rem > 0; +- a = nla_next(a, &rem)) { ++ nla_for_each_nested(a, attr, rem) { + switch (nla_type(a)) { + case OVS_USERSPACE_ATTR_USERDATA: + upcall.userdata = a; diff --git a/queue-5.4/series b/queue-5.4/series index 073e43c0f0..5bb37eed01 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -80,3 +80,6 @@ alsa-es1968-add-error-handling-for-snd_pcm_hw_constraint_pow2.patch phy-fix-error-handling-in-tegra_xusb_port_init.patch phy-renesas-rcar-gen3-usb2-set-timing-registers-only-once.patch clocksource-i8253-use-raw_spinlock_irqsave-in-clockevent_i8253_disable.patch +input-synaptics-enable-smbus-for-hp-elitebook-850-g1.patch +input-synaptics-enable-intertouch-on-tuxedo-infinitybook-pro-14-v5.patch +openvswitch-fix-unsafe-attribute-parsing-in-output_userspace.patch