Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Wed, 29 Aug 2018 23:19:38 +0000 (16:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Aug 2018 23:19:38 +0000 (16:19 -0700)
commit26f7a062f42664d3aa8cc4aa5f615d01e51b0d31
treedaa8c87faa188cf123e905140f1ab3e995439fc4
parent302031ce9415a19786909e94373fb0bcc682aebd
parent898a8c8d422b53a07e9f1ac1b83b1bb01f21d580
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2018-08-29

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

The main changes are:

1) Fix a build error in sk_reuseport_convert_ctx_access() when
   compiling with clang which cannot resolve hweight_long() at
   build time inside the BUILD_BUG_ON() assertion, from Stefan.

2) Several fixes for BPF sockmap, four of them in getting the
   bpf_msg_pull_data() helper to work, one use after free case
   in bpf_tcp_close() and one refcount leak in bpf_tcp_recvmsg(),
   from Daniel.

3) Another fix for BPF sockmap where we misaccount sk_mem_uncharge()
   in the socket redirect error case from unwinding scatterlist
   twice, from John.
====================

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