summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEdward Cree <ecree@solarflare.com>2017-09-19 18:45:56 +0100
committerDavid S. Miller <davem@davemloft.net>2017-09-20 15:44:22 -0700
commit92dd5452c1be873a1193561f4f691763103d22ac (patch)
tree664288c91b1120f000c5217c3bfb64595acc1f82 /net
parentc2a64bb9fcd31c39feddf30748b4ee8d82e53c6a (diff)
downloadop-kernel-dev-92dd5452c1be873a1193561f4f691763103d22ac.zip
op-kernel-dev-92dd5452c1be873a1193561f4f691763103d22ac.tar.gz
net: change skb->mac_header when Generic XDP calls adjust_head
Since XDP's view of the packet includes the MAC header, moving the start- of-packet with bpf_xdp_adjust_head needs to also update the offset of the MAC header (which is relative to skb->head, not to the skb->data that was changed). Without this, tcpdump sees packets starting from the old MAC header rather than the new one, at least in my tests on the loopback device. Fixes: b5cdae3291f7 ("net: Generic XDP") Signed-off-by: Edward Cree <ecree@solarflare.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 fb766d9..9a2254f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3892,6 +3892,7 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
__skb_pull(skb, off);
else if (off < 0)
__skb_push(skb, -off);
+ skb->mac_header += off;
switch (act) {
case XDP_REDIRECT:
OpenPOWER on IntegriCloud