Hi David,

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

The main changes are:

1) Several BPF sockmap fixes mostly related to bugs in error path
   handling, that is, a bug in updating the scatterlist length /
   offset accounting, a missing sk_mem_uncharge() in redirect
   error handling, and a bug where the outstanding bytes counter
   sg_size was not zeroed, from John.

2) Fix two memory leaks in the x86-64 BPF JIT, one in an error
   path where we still don't converge after image was allocated
   and another one where BPF calls are used and JIT passes don't
   converge, from Daniel.

3) Minor fix in BPF selftests where in test_stacktrace_build_id()
   we drop useless args in urandom_read and we need to add a missing
   newline in a CHECK() error message, from Song.

Please consider pulling these changes from:

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

Thanks a lot!

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

The following changes since commit 25eb0ea7174c6e84f21fa59dccbddd0318b17b12:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2018-04-25 
22:55:33 -0400)

are available in the git repository at:

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

for you to fetch changes up to b5b6ff730253ab68ec230e239c4245cb1e8a5397:

  Merge branch 'bpf-sockmap-fixes' (2018-05-02 15:30:46 -0700)

----------------------------------------------------------------
Alexei Starovoitov (2):
      Merge branch 'x86-bpf-jit-fixes'
      Merge branch 'bpf-sockmap-fixes'

Daniel Borkmann (2):
      bpf, x64: fix memleak when not converging after image
      bpf, x64: fix memleak when not converging on calls

John Fastabend (4):
      bpf: fix uninitialized variable in bpf tools
      bpf: sockmap, fix scatterlist update on error path in send with apply
      bpf: sockmap, zero sg_size on error when buffer is released
      bpf: sockmap, fix error handling in redirect failures

Song Liu (1):
      bpf: minor fix to selftest test_stacktrace_build_id()

 arch/x86/net/bpf_jit_comp.c              |  6 ++--
 kernel/bpf/sockmap.c                     | 48 +++++++++++++++++---------------
 tools/bpf/bpf_dbg.c                      |  7 +++--
 tools/testing/selftests/bpf/test_progs.c |  4 +--
 4 files changed, 36 insertions(+), 29 deletions(-)

Reply via email to