This is a note to let you know that I've just added the patch titled
net: thunderbolt: Fix TCPv6 GSO checksum calculation
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-thunderbolt-fix-tcpv6-gso-checksum-calculation.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e0b65f9b81fef180cf5f103adecbe5505c961153 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Date: Wed, 13 Sep 2023 08:26:47 +0300
Subject: net: thunderbolt: Fix TCPv6 GSO checksum calculation
From: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
commit e0b65f9b81fef180cf5f103adecbe5505c961153 upstream.
Alex reported that running ssh over IPv6 does not work with
Thunderbolt/USB4 networking driver. The reason for that is that driver
should call skb_is_gso() before calling skb_is_gso_v6(), and it should
not return false after calculates the checksum successfully. This probably
was a copy paste error from the original driver where it was done properly.
Reported-by: Alex Balcanquall <alex@xxxxxxxxxxx>
Fixes: e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Reviewed-by: Eric Dumazet <edumazet@xxxxxxxxxx>
Reviewed-by: Jiri Pirko <jiri@xxxxxxxxxx>
Reviewed-by: Jiri Pirko <jiri@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/thunderbolt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/drivers/net/thunderbolt.c
+++ b/drivers/net/thunderbolt.c
@@ -958,12 +958,11 @@ static bool tbnet_xmit_csum_and_map(stru
*tucso = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
ip_hdr(skb)->daddr, 0,
ip_hdr(skb)->protocol, 0);
- } else if (skb_is_gso_v6(skb)) {
+ } else if (skb_is_gso(skb) && skb_is_gso_v6(skb)) {
tucso = dest + ((void *)&(tcp_hdr(skb)->check) - data);
*tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
&ipv6_hdr(skb)->daddr, 0,
IPPROTO_TCP, 0);
- return false;
} else if (protocol == htons(ETH_P_IPV6)) {
tucso = dest + skb_checksum_start_offset(skb) + skb->csum_offset;
*tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
Patches currently in stable-queue which might be from mika.westerberg@xxxxxxxxxxxxxxx are
queue-5.10/watchdog-itco_wdt-no-need-to-stop-the-timer-in-probe.patch
queue-5.10/i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch
queue-5.10/platform-x86-intel_scu_ipc-fail-ipc-send-if-still-bu.patch
queue-5.10/platform-x86-intel_scu_ipc-check-status-after-timeou.patch
queue-5.10/platform-x86-intel_scu_ipc-check-status-upon-timeout.patch
queue-5.10/net-thunderbolt-fix-tcpv6-gso-checksum-calculation.patch
queue-5.10/platform-x86-intel_scu_ipc-don-t-override-scu-in-int.patch
queue-5.10/watchdog-itco_wdt-set-no_reboot-if-the-watchdog-is-n.patch
