diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-18 18:49:22 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-18 18:49:22 +0300 |
| commit | b36025b19a2301ba0cac05e6ffad5668013d2c77 (patch) | |
| tree | 2fff4e78df48f5d9af54b35d9aa4aa8dd1494188 /net | |
| parent | f870c1ff65a6d1f3a083f277280802ee09a5b44d (diff) | |
| parent | c1b08ebe5003ae291470cb6e26923628ab19606f (diff) | |
| download | linux-b36025b19a2301ba0cac05e6ffad5668013d2c77.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2017-12-17
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a corner case in generic XDP where we have non-linear skbs
but enough tailroom in the skb to not miss to linearizing there,
from Song.
2) Fix BPF JIT bugs in s390x and ppc64 to not recache skb data when
BPF context is not skb, from Daniel.
3) Fix a BPF JIT bug in sparc64 where recaching skb data after helper
call would use the wrong register for the skb, from Daniel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index f47e96b62308..01ee854454a8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3904,7 +3904,7 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb, hroom > 0 ? ALIGN(hroom, NET_SKB_PAD) : 0, troom > 0 ? troom + 128 : 0, GFP_ATOMIC)) goto do_drop; - if (troom > 0 && __skb_linearize(skb)) + if (skb_linearize(skb)) goto do_drop; } |