Hi David, 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. 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 4608f064532c28c0ea3c03fe26a3a5909852811a: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next (2018-04-03 14:08:58 -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 33491588c1fb2c76ed114a211ad0ee76c16b5a0c: kernel/bpf/syscall: fix warning defined but not used (2018-04-04 11:08:36 +0200) ---------------------------------------------------------------- Anders Roxell (1): kernel/bpf/syscall: fix warning defined but not used John Fastabend (2): bpf: sockmap, free memory on sock close with cork data bpf: sockmap, duplicates release calls may NULL sk_prot kernel/bpf/sockmap.c | 12 ++++++++++-- kernel/bpf/syscall.c | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-)