net: selftests: fix TCP packet checksum
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 net: selftests: fix TCP packet checksum
The length in the pseudo header should be the length of the L3 payload AKA the L4 header+payload. The selftest code builds the packet from the lower layers up, so all the headers are pushed already when it constructs L4. We need to subtract the lower layer headers from skb->len.
---
CC: [email protected]
CC: [email protected]
I changed the math from the pointers to the offsets (which is what udp4_hwcsum() does). Oleksij, would you be willing to retest and send your Reported-and-tested-by: tag?
--- net/core/selftests.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/core/selftests.c +3 -2
@@ -160,8 +160,9 @@ static struct sk_buff *net_test_get_skb(struct net_device *ndev, skb->csum =0 ; skb->ip_summed =CHECKSUM_PARTIAL ;if (attr->tcp) { - thdr->check = ~tcp_v4_check (skb->len, ihdr->saddr, - ihdr->daddr,0 ); +int l4len = skb->len -skb_transport_offset (skb); + + thdr->check = ~tcp_v4_check (l4len, ihdr->saddr, ihdr->daddr,0 ); skb->csum_start =skb_transport_header (skb) - skb->head; skb->csum_offset = offsetof(struct tcphdr , check); }else {
Signature · 1 line
2.49.0
Quoted 24 lines · Jakub Kicinski
The length in the pseudo header should be the length of the L3 payload AKA the L4 header+payload. The selftest code builds the packet from the lower layers up, so all the headers are pushed already when it constructs L4. We need to subtract the lower layer headers from
skb->len.Fixes 3e1e58d64c3d ("net: add generic selftest support")Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]I changed the math from the pointers to the offsets (which is what
udp4_hwcsum()does). Oleksij, would you be willing to retest and send your Reported-and-tested-by: tag?--- net/core/selftests.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)net/core/selftests.c +0
-0@@ -160,8 +160,9 @@ static struct sk_buff *net_test_get_skb(struct net_device *ndev, skb->csum =0 ;
net/core/selftests.c static struct sk_buff *net_test_get_skb(struct net_device *ndev, · line 168
Quoted 10 lines
net/core/selftests.c +3
-2skb->ip_summed =CHECKSUM_PARTIAL ;if (attr->tcp) { - thdr->check = ~tcp_v4_check (skb->len, ihdr->saddr, - ihdr->daddr,0 ); +int l4len = skb->len -skb_transport_offset (skb); + + thdr->check = ~tcp_v4_check (l4len, ihdr->saddr, ihdr->daddr,0 ); skb->csum_start =skb_transport_header (skb) - skb->head; skb->csum_offset = offsetof(struct tcphdr , check); }else {
And also tested with my selftest patches for tsnep, which did not made it into mainline. So I'm not sure if a Tested-by is allowed.
(Tested-by: Gerhard Engleder <[email protected]>)
gerhard
Quoted 7 lines · Jakub Kicinski
The length in the pseudo header should be the length of the L3 payload AKA the L4 header+payload. The selftest code builds the packet from the lower layers up, so all the headers are pushed already when it constructs L4. We need to subtract the lower layer headers from
skb->len.Fixes 3e1e58d64c3d ("net: add generic selftest support")Signed-off-by Jakub Kicinski <[email protected]>
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Tue, 24 Jun 2025 11:32:58 -0700 you wrote:
The length in the pseudo header should be the length of the L3 payload AKA the L4 header+payload. The selftest code builds the packet from the lower layers up, so all the headers are pushed already when it constructs L4. We need to subtract the lower layer headers from
skb->len.Fixes 3e1e58d64c3d ("net: add generic selftest support")Signed-off-by Jakub Kicinski <[email protected]>[...]
Here is the summary with links:
- [net] net: selftests: fix TCP packet checksum
https://git.kernel.org/netdev/net/c/8d89661a36dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html