diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-26 21:41:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-26 21:41:49 -0700 |
| commit | 6788fac82001ed1944b5da976bcec4a7b9accf51 (patch) | |
| tree | b003137f9b8cfceac884409216f61cbb2a2f4ddd /include | |
| parent | 345671ea0f9258f410eb057b9ced9cefbbe5dc78 (diff) | |
| parent | d8fd9e106fbc291167ebb675ad69234597d0fd98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-10-27
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix toctou race in BTF header validation, from Martin and Wenwen.
2) Fix devmap interface comparison in notifier call which was
neglecting netns, from Taehee.
3) Several fixes in various places, for example, correcting direct
packet access and helper function availability, from Daniel.
4) Fix BPF kselftest config fragment to include af_xdp and sockmap,
from Naresh.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 91b4c934f02e..de629b706d1d 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -854,6 +854,7 @@ bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk, extern int bpf_jit_enable; extern int bpf_jit_harden; extern int bpf_jit_kallsyms; +extern int bpf_jit_limit; typedef void (*bpf_jit_fill_hole_t)(void *area, unsigned int size); |