From: Jason A. Donenfeld Date: Sat, 15 Aug 2020 07:29:30 +0000 (+0200) Subject: net: xdp: pull ethernet header off packet after computing skb->protocol X-Git-Tag: v5.9-rc2~35^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8414a8d886b613b90d9fdf7cda6feea313b1069;p=thirdparty%2Fkernel%2Flinux.git net: xdp: pull ethernet header off packet after computing skb->protocol When an XDP program changes the ethernet header protocol field, eth_type_trans is used to recalculate skb->protocol. In order for eth_type_trans to work correctly, the ethernet header must actually be part of the skb data segment, so the code first pushes that onto the head of the skb. However, it subsequently forgets to pull it back off, making the behavior of the passed-on packet inconsistent between the protocol modifying case and the static protocol case. This patch fixes the issue by simply pulling the ethernet header back off of the skb head. Fixes: 297249569932 ("net: fix generic XDP to handle if eth header was mangled") Cc: Jesper Dangaard Brouer Cc: David S. Miller Signed-off-by: Jason A. Donenfeld Signed-off-by: David S. Miller --- diff --git a/net/core/dev.c b/net/core/dev.c index b5d1129d83103..7592d7dd61097 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4676,6 +4676,7 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb, (orig_bcast != is_multicast_ether_addr_64bits(eth->h_dest))) { __skb_push(skb, ETH_HLEN); skb->protocol = eth_type_trans(skb, skb->dev); + __skb_pull(skb, ETH_HLEN); } switch (act) {