tree d913d7859536871bdd3ecd10fe100ade6f69b4b5
parent 4c7c12e0c9b8224170afd974eed9ea032bd7f453
parent 33491588c1fb2c76ed114a211ad0ee76c16b5a0c
author David S. Miller <davem@davemloft.net> 1523231501 -0400
committer David S. Miller <davem@davemloft.net> 1523231501 -0400

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

Daniel Borkmann says:

====================
pull-request: bpf 2018-04-09

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

The main changes are:

1) Two sockmap fixes: i) fix a potential warning when a socket with
   pending cork data is closed by freeing the memory right when the
   socket is closed instead of seeing still outstanding memory at
   garbage collector time, ii) fix a NULL pointer deref in case of
   duplicates release calls, so make sure to only reset the sk_prot
   pointer when it's in a valid state to do so, both from John.

2) Fix a compilation warning in bpf_prog_attach_check_attach_type()
   by moving the function under CONFIG_CGROUP_BPF ifdef since only
   used there, from Anders.
====================

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