Hi David, hi Jakub, The following pull-request contains BPF updates for your *net* tree. We've added 4 non-merge commits during the last 2 day(s) which contain a total of 4 files changed, 31 insertions(+), 10 deletions(-). The main changes are: 1) Validate and reject invalid JIT branch displacements, from Piotr Krysiuk. 2) Fix incorrect unhash restore as well as fwd_alloc memory accounting in sock map, from John Fastabend. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! Also thanks to reporters, reviewers and testers of commits in this pull-request: Andrii Nakryiko, Cong Wang, Daniel Borkmann, Lorenz Bauer ---------------------------------------------------------------- The following changes since commit 2a2403ca3add03f542f6b34bef9f74649969b06d: tipc: increment the tmp aead refcnt before attaching it (2021-04-06 16:25:34 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to 26f55a59dc65ff77cd1c4b37991e26497fc68049: bpf, x86: Validate computation of branch displacements for x86-32 (2021-04-08 16:24:53 +0200) ---------------------------------------------------------------- John Fastabend (2): bpf, sockmap: Fix sk->prot unhash op reset bpf, sockmap: Fix incorrect fwd_alloc accounting Piotr Krysiuk (2): bpf, x86: Validate computation of branch displacements for x86-64 bpf, x86: Validate computation of branch displacements for x86-32 arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- arch/x86/net/bpf_jit_comp32.c | 11 ++++++++++- include/linux/skmsg.h | 7 ++++++- net/core/skmsg.c | 12 +++++------- 4 files changed, 31 insertions(+), 10 deletions(-)
