Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: fix wrong network header length

When clatd starts with ebpf offloaing, and NETIF_F_GRO_FRAGLIST is enable,
several skbs are gathered in skb_shinfo(skb)->frag_list. The first skb's
ipv6 header will be changed to ipv4 after bpf_skb_proto_6_to_4,
network_header\transport_header\mac_header have been updated as ipv4 acts,
but other skbs in frag_list didnot update anything, just ipv6 packets.

udp_queue_rcv_skb will call skb_segment_list to traverse other skbs in
frag_list and make sure right udp payload is delivered to user space.
Unfortunately, other skbs in frag_list who are still ipv6 packets are
updated like the first skb and will have wrong transport header length.

e.g.before bpf_skb_proto_6_to_4,the first skb and other skbs in frag_list
has the same network_header(24)& transport_header(64), after
bpf_skb_proto_6_to_4, ipv6 protocol has been changed to ipv4, the first
skb's network_header is 44,transport_header is 64, other skbs in frag_list
didnot change.After skb_segment_list, the other skbs in frag_list has
different network_header(24) and transport_header(44), so there will be 20
bytes different from original,that is difference between ipv6 header and
ipv4 header. Just change transport_header to be the same with original.

Actually, there are two solutions to fix it, one is traversing all skbs
and changing every skb header in bpf_skb_proto_6_to_4, the other is
modifying frag_list skb's header in skb_segment_list. Considering
efficiency, adopt the second one--- when the first skb and other skbs in
frag_list has different network_header length, restore them to make sure
right udp payload is delivered to user space.

Signed-off-by: Lina Wang <lina.wang@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Lina Wang and committed by
David S. Miller
cf3ab8d4 49e6123c

+3 -1
+3 -1
net/core/skbuff.c
··· 3897 3897 unsigned int delta_len = 0; 3898 3898 struct sk_buff *tail = NULL; 3899 3899 struct sk_buff *nskb, *tmp; 3900 - int err; 3900 + int len_diff, err; 3901 3901 3902 3902 skb_push(skb, -skb_network_offset(skb) + offset); 3903 3903 ··· 3937 3937 skb_push(nskb, -skb_network_offset(nskb) + offset); 3938 3938 3939 3939 skb_release_head_state(nskb); 3940 + len_diff = skb_network_header_len(nskb) - skb_network_header_len(skb); 3940 3941 __copy_skb_header(nskb, skb); 3941 3942 3942 3943 skb_headers_offset_update(nskb, skb_headroom(nskb) - skb_headroom(skb)); 3944 + nskb->transport_header += len_diff; 3943 3945 skb_copy_from_linear_data_offset(skb, -tnl_hlen, 3944 3946 nskb->data - tnl_hlen, 3945 3947 offset + tnl_hlen);