mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-21 01:51:18 +00:00
Code Issues Releases Wiki Activity

selftests: net: csum: Fix checksums for packets with non-zero padding

Browse source 
[ Upstream commit e8a63d473b ]

Padding is not included in UDP and TCP checksums. Therefore, reduce the
length of the checksummed data to include only the data in the IP
payload. This fixes spurious reported checksum failures like

rx: pkt: sport=33000 len=26 csum=0xc850 verify=0xf9fe
pkt: bad csum

Technically it is possible for there to be trailing bytes after the UDP
data but before the Ethernet padding (e.g. if sizeof(ip) + sizeof(udp) +
udp.len < ip.len). However, we don't generate such packets.

Fixes: 91a7de8560 ("selftests/net: add csum offload test")
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20240906210743.627413-1-sean.anderson@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sean Anderson 2024-09-06 17:07:43 -04:00 committed by Greg Kroah-Hartman
parent 38859fb5bd
commit 033a71efab
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/testing/selftests/net/csum.c
View file

@ -654,10 +654,16 @@ static int recv_verify_packet_ipv4(void *nh, int len)
{ {
struct iphdr *iph = nh; struct iphdr *iph = nh;
uint16_t proto = cfg_encap ? IPPROTO_UDP : cfg_proto; uint16_t proto = cfg_encap ? IPPROTO_UDP : cfg_proto;
uint16_t ip_len;
if (len < sizeof(*iph) || iph->protocol != proto) if (len < sizeof(*iph) || iph->protocol != proto)
return -1; return -1;
ip_len = ntohs(iph->tot_len);
if (ip_len > len || ip_len < sizeof(*iph))
return -1;
len = ip_len;
iph_addr_p = &iph->saddr; iph_addr_p = &iph->saddr;
if (proto == IPPROTO_TCP) if (proto == IPPROTO_TCP)
return recv_verify_packet_tcp(iph + 1, len - sizeof(*iph)); return recv_verify_packet_tcp(iph + 1, len - sizeof(*iph));
@ -669,16 +675,22 @@ static int recv_verify_packet_ipv6(void *nh, int len)
{ {
struct ipv6hdr *ip6h = nh; struct ipv6hdr *ip6h = nh;
uint16_t proto = cfg_encap ? IPPROTO_UDP : cfg_proto; uint16_t proto = cfg_encap ? IPPROTO_UDP : cfg_proto;
uint16_t ip_len;
if (len < sizeof(*ip6h) || ip6h->nexthdr != proto) if (len < sizeof(*ip6h) || ip6h->nexthdr != proto)
return -1; return -1;
ip_len = ntohs(ip6h->payload_len);
if (ip_len > len - sizeof(*ip6h))
return -1;
len = ip_len;
iph_addr_p = &ip6h->saddr; iph_addr_p = &ip6h->saddr;
if (proto == IPPROTO_TCP) if (proto == IPPROTO_TCP)
return recv_verify_packet_tcp(ip6h + 1, len - sizeof(*ip6h)); return recv_verify_packet_tcp(ip6h + 1, len);
else else
return recv_verify_packet_udp(ip6h + 1, len - sizeof(*ip6h)); return recv_verify_packet_udp(ip6h + 1, len);
} }
/* return whether auxdata includes TP_STATUS_CSUM_VALID */ /* return whether auxdata includes TP_STATUS_CSUM_VALID */