Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Apr 2021 21:10:53 +0000 (14:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Apr 2021 21:10:53 +0000 (14:10 -0700)
commit971e3057113d5eb25597af1ae61450c0b87c5287
treeae19dab62690938047d3275ffd23eb5e07e9a120
parentac075bdd6899b03785d7fbe3abed1cdf13162726
parent26f55a59dc65ff77cd1c4b37991e26497fc68049
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2021-04-08

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.

====================

Signed-off-by: David S. Miller <davem@davemloft.net>