mbox series

pull-request: bpf-next 2020-10-15

Message ID 20201015191552.12435-1-daniel@iogearbox.net
State Accepted
Delegated to: David Miller
Headers show
Series pull-request: bpf-next 2020-10-15 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Message

Daniel Borkmann Oct. 15, 2020, 7:15 p.m. UTC
Hi David, hi Jakub,

The following pull-request contains BPF *fixes* for your *net-next* tree.

We've added 4 non-merge commits during the last 3 day(s) which contain
a total of 5 files changed, 70 insertions(+), 46 deletions(-).

The main changes are:

1) Fix register equivalence tracking in verifier, from Alexei Starovoitov.

2) Fix sockmap error path to not call bpf_prog_put() with NULL, from Alex Dewar.

3) Fix sockmap to add locking annotations to iterator, from Lorenz Bauer.

4) Fix tcp_hdr_options test to use loopback address, from Martin KaFai Lau.

Please consider pulling these changes from:

  git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Thanks a lot!

Also thanks to reporters, reviewers and testers of commits in this pull-request:

Andrii Nakryiko, Jakub Sitnicki, John Fastabend, kernel test robot, 
Yonghong Song

----------------------------------------------------------------

The following changes since commit ccdf7fae3afaeaf0e5dd03311b86ffa56adf85ae:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (2020-10-12 16:16:50 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git 

for you to fetch changes up to 83c11c17553c0fca217105c17444c4ef5ab2403f:

  net, sockmap: Don't call bpf_prog_put() on NULL pointer (2020-10-15 21:05:23 +0200)

----------------------------------------------------------------
Alex Dewar (1):
      net, sockmap: Don't call bpf_prog_put() on NULL pointer

Alexei Starovoitov (1):
      bpf: Fix register equivalence tracking.

Lorenz Bauer (1):
      bpf, sockmap: Add locking annotations to iterator

Martin KaFai Lau (1):
      bpf, selftest: Fix flaky tcp_hdr_options test when adding addr to lo

 kernel/bpf/verifier.c                              | 38 ++++++++++++++--------
 net/core/sock_map.c                                | 24 ++++++++++----
 .../selftests/bpf/prog_tests/tcp_hdr_options.c     | 26 +--------------
 .../bpf/progs/test_misc_tcp_hdr_options.c          |  2 +-
 tools/testing/selftests/bpf/verifier/regalloc.c    | 26 +++++++++++++++
 5 files changed, 70 insertions(+), 46 deletions(-)

Comments

Jakub Kicinski Oct. 15, 2020, 8:33 p.m. UTC | #1
On Thu, 15 Oct 2020 21:15:52 +0200 Daniel Borkmann wrote:
> The main changes are:
> 
> 1) Fix register equivalence tracking in verifier, from Alexei Starovoitov.
> 
> 2) Fix sockmap error path to not call bpf_prog_put() with NULL, from Alex Dewar.
> 
> 3) Fix sockmap to add locking annotations to iterator, from Lorenz Bauer.
> 
> 4) Fix tcp_hdr_options test to use loopback address, from Martin KaFai Lau.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Pulled, thanks!