]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
gso_segment: Reset skb->mac_len after modifying network header
authorToke Høiland-Jørgensen <toke@toke.dk>
Thu, 13 Sep 2018 14:43:07 +0000 (16:43 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Sep 2018 19:09:32 +0000 (12:09 -0700)
commitc56cae23c6b167acc68043c683c4573b80cbcc2c
tree464282d99ac15a15742084d5891e0a5f64447f03
parentbffb9b51a230e61cc3870f30cc158a8a003eb55f
gso_segment: Reset skb->mac_len after modifying network header

When splitting a GSO segment that consists of encapsulated packets, the
skb->mac_len of the segments can end up being set wrong, causing packet
drops in particular when using act_mirred and ifb interfaces in
combination with a qdisc that splits GSO packets.

This happens because at the time skb_segment() is called, network_header
will point to the inner header, throwing off the calculation in
skb_reset_mac_len(). The network_header is subsequently adjust by the
outer IP gso_segment handlers, but they don't set the mac_len.

Fix this by adding skb_reset_mac_len() calls to both the IPv4 and IPv6
gso_segment handlers, after they modify the network_header.

Many thanks to Eric Dumazet for his help in identifying the cause of
the bug.

Acked-by: Dave Taht <dave.taht@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/af_inet.c
net/ipv6/ip6_offload.c