diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-27 16:23:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-27 16:23:32 +0200 |
| commit | 3c30819dc68ab9498216421b6846123900c0a6d3 (patch) | |
| tree | 2da4d8143b0a9f171cb38ba70ca9c1f339b24cef /net | |
| parent | Merge branch 'qdisc-destroy' (diff) | |
| parent | bpf: Fix bpf_event_output re-entry issue (diff) | |
| download | linux-3c30819dc68ab9498216421b6846123900c0a6d3.tar.xz linux-3c30819dc68ab9498216421b6846123900c0a6d3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2019-09-27
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix libbpf's BTF dumper to not skip anonymous enum definitions, from Andrii.
2) Fix BTF verifier issues when handling the BTF of vmlinux, from Alexei.
3) Fix nested calls into bpf_event_output() from TCP sockops BPF
programs, from Allan.
4) Fix NULL pointer dereference in AF_XDP's xsk map creation when
allocation fails, from Jonathan.
5) Remove unneeded 64 byte alignment requirement of the AF_XDP UMEM
headroom, from Bjorn.
6) Remove unused XDP_OPTIONS getsockopt() call which results in an error
on older kernels, from Toke.
7) Fix a client/server race in tcp_rtt BPF kselftest case, from Stanislav.
8) Fix indentation issue in BTF's btf_enum_check_kflag_member(), from Colin.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xdp/xdp_umem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 947b8ff0227e..cdaef54d48be 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -383,8 +383,6 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) return -EINVAL; } - headroom = ALIGN(headroom, 64); - size_chk = chunk_size - headroom - XDP_PACKET_HEADROOM; if (size_chk < 0) return -EINVAL; |