Commit aaa64527 authored by Nikita V. Shirokov's avatar Nikita V. Shirokov Committed by Daniel Borkmann

bpf: fix virtio-net's length calc for XDP_PASS

In commit 6870de43 ("bpf: make virtio compatible w/
bpf_xdp_adjust_tail") i didn't account for vi->hdr_len during new
packet's length calculation after bpf_prog_run in receive_mergeable.
because of this all packets, if they were passed to the kernel,
were truncated by 12 bytes.

Fixes:6870de43 ("bpf: make virtio compatible w/ bpf_xdp_adjust_tail")
Reported-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarNikita V. Shirokov <tehnerd@tehnerd.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 48d7a07b
...@@ -765,7 +765,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, ...@@ -765,7 +765,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
/* recalculate len if xdp.data or xdp.data_end were /* recalculate len if xdp.data or xdp.data_end were
* adjusted * adjusted
*/ */
len = xdp.data_end - xdp.data; len = xdp.data_end - xdp.data + vi->hdr_len;
/* We can only create skb based on xdp_page. */ /* We can only create skb based on xdp_page. */
if (unlikely(xdp_page != page)) { if (unlikely(xdp_page != page)) {
rcu_read_unlock(); rcu_read_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment