pull-request: bpf 2018-09-02

[Daniel Borkmann <daniel@iogearbox.net>]

Hi David,

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

The main changes are:

1) Fix one remaining buggy offset override in sockmap's bpf_msg_pull_data()
   when linearizing multiple scatterlist elements, from Tushar.

2) Fix BPF sockmap's misuse of ULP when a collision with another ULP is
   found on map update where it would release existing ULP. syzbot found and
   triggered this couple of times now, fix from John.

3) Add missing xskmap type to bpftool so it will properly show the type
   on map dump, from Prashant.

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 93bbadd6e0a2a58e49d265b9b1aa58e621b60a26:

  ipv6: don't get lwtstate twice in ip6_rt_copy_init() (2018-09-01 17:42:12 -0700)

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 597222f72a94118f593e4f32bf58ae7e049a0df1:

  bpf: avoid misuse of psock when TCP_ULP_BPF collides with another ULP (2018-09-02 22:31:10 +0200)

----------------------------------------------------------------
John Fastabend (1):
      bpf: avoid misuse of psock when TCP_ULP_BPF collides with another ULP

Prashant Bhole (1):
      tools/bpf: bpftool, add xskmap in map types

Tushar Dave (1):
      bpf: Fix bpf_msg_pull_data()

 kernel/bpf/sockmap.c    | 12 +++++++++++-
 net/core/filter.c       |  7 +++----
 tools/bpf/bpftool/map.c |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)