Skip to content

Commit bcefc3c

Browse files
Benoît Moningregkh
authored andcommitted
net: skip offload for NETIF_F_IPV6_CSUM if ipv6 header contains extension
[ Upstream commit 04c20a9 ] As documented in skbuff.h, devices with NETIF_F_IPV6_CSUM capability can only checksum TCP and UDP over IPv6 if the IP header does not contains extension. This is enforced for UDP packets emitted from user-space to an IPv6 address as they go through ip6_make_skb(), which calls __ip6_append_data() where a check is done on the header size before setting CHECKSUM_PARTIAL. But the introduction of UDP encapsulation with fou6 added a code-path where it is possible to get an skb with a partial UDP checksum and an IPv6 header with extension: * fou6 adds a UDP header with a partial checksum if the inner packet does not contains a valid checksum. * ip6_tunnel adds an IPv6 header with a destination option extension header if encap_limit is non-zero (the default value is 4). The thread linked below describes in more details how to reproduce the problem with GRE-in-UDP tunnel. Add a check on the network header size in skb_csum_hwoffload_help() to make sure no IPv6 packet with extension header is handed to a network device with NETIF_F_IPV6_CSUM capability. Link: https://lore.kernel.org/netdev/26548921.1r3eYUQgxm@benoit.monin/T/#u Fixes: aa3463d ("fou: Add encap ops for IPv6 tunnels") Signed-off-by: Benoît Monin <benoit.monin@gmx.fr> Reviewed-by: Willem de Bruijn <willemb@google.com> Link: https://patch.msgid.link/5fbeecfc311ea182aa1d1c771725ab8b4cac515e.1729778144.git.benoit.monin@gmx.fr Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2c88668 commit bcefc3c

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

net/core/dev.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3327,13 +3327,17 @@ int skb_csum_hwoffload_help(struct sk_buff *skb,
33273327
return 0;
33283328

33293329
if (features & (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)) {
3330+
if (vlan_get_protocol(skb) == htons(ETH_P_IPV6) &&
3331+
skb_network_header_len(skb) != sizeof(struct ipv6hdr))
3332+
goto sw_checksum;
33303333
switch (skb->csum_offset) {
33313334
case offsetof(struct tcphdr, check):
33323335
case offsetof(struct udphdr, check):
33333336
return 0;
33343337
}
33353338
}
33363339

3340+
sw_checksum:
33373341
return skb_checksum_help(skb);
33383342
}
33393343
EXPORT_SYMBOL(skb_csum_hwoffload_help);

0 commit comments

Comments
 (0)