summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-08-15 09:29:30 +0200
committerDavid S. Miller <davem@davemloft.net>2020-08-16 15:28:18 -0700
commitf8414a8d886b613b90d9fdf7cda6feea313b1069 (patch)
tree5c12348c0fbfde213c6f86d3a5e8733ec0e27a9c /net
parentd0f5c7076e01fef6fcb86988d9508bf3ce258bd4 (diff)
downloadlinux-stable-f8414a8d886b613b90d9fdf7cda6feea313b1069.tar.gz
linux-stable-f8414a8d886b613b90d9fdf7cda6feea313b1069.tar.bz2
linux-stable-f8414a8d886b613b90d9fdf7cda6feea313b1069.zip
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 <brouer@redhat.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index b5d1129d8310..7592d7dd6109 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) {