David S. Miller 69138b34a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf ... Daniel Borkmann says: ==================== pull-request: bpf 2020-07-31 The following pull-request contains BPF updates for your *net* tree. We've added 5 non-merge commits during the last 21 day(s) which contain a total of 5 files changed, 126 insertions(+), 18 deletions(-). The main changes are: 1) Fix a map element leak in HASH_OF_MAPS map type, from Andrii Nakryiko. 2) Fix a NULL pointer dereference in __btf_resolve_helper_id() when no btf_vmlinux is available, from Peilin Ye. 3) Init pos variable in __bpfilter_process_sockopt(), from Christoph Hellwig. 4) Fix a cgroup sockopt verifier test by specifying expected attach type, from Jean-Philippe Brucker. Note that when net gets merged into net-next later on, there is a small merge conflict in kernel/bpf/btf.c between commit 5b801dfb7f ("bpf: Fix NULL pointer dereference in __btf_resolve_helper_id()") from the bpf tree and commit 138b9a0511 ("bpf: Remove btf_id helpers resolving") from the net-next tree. Resolve as follows: remove the old hunk with the __btf_resolve_helper_id() function. Change the btf_resolve_helper_id() so it actually tests for a NULL btf_vmlinux and bails out: int btf_resolve_helper_id(struct bpf_verifier_log *log, const struct bpf_func_proto *fn, int arg) { int id; if (fn->arg_type[arg] != ARG_PTR_TO_BTF_ID || !btf_vmlinux) return -EINVAL; id = fn->btf_id[arg]; if (!id || id > btf_vmlinux->nr_types) return -EINVAL; return id; } Let me know if you run into any others issues (CC'ing Jiri Olsa so he's in the loop with regards to merge conflict resolution). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-31 17:19:47 -07:00
..
accounting
arch	tools arch kvm: Sync kvm headers with the kernel sources	2020-07-17 09:39:16 -03:00
bootconfig	tools/bootconfig: Add testcase for show-command and quotes test	2020-06-16 21:21:03 -04:00
bpf	tools, bpftool: Add ringbuf map type to map command docs	2020-06-17 17:52:30 +02:00
build	perf build: Remove libaudit from the default feature checks	2020-05-29 16:51:13 -03:00
cgroup
debugging
edid
firewire
firmware
gpio
hv
iio
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-10 18:16:22 -07:00
io_uring
kvm/kvm_stat
laptop
leds
lib	libsubcmd: Fix OPT_CALLBACK_SET()	2020-07-17 09:33:06 -03:00
memory-model
nfsd
objtool	Peter Zijlstra says:	2020-06-28 10:16:15 -07:00
pci
pcmcia
perf	s390/cpum_cf,perf: change DFLT_CCERROR counter name	2020-07-21 13:53:56 +02:00
power	Merge branch 'acpica'	2020-06-10 17:27:28 +02:00
scripts
spi	spi: tools: Make default_tx/rx and input_tx static	2020-06-11 16:27:24 +01:00
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf	2020-07-31 17:19:47 -07:00
thermal/tmon
time
usb
virtio	tools/virtio: Use tools/include/list.h instead of stubs	2020-06-22 12:34:22 -04:00
vm	tools/vm/page_owner_sort.c: filter out unneeded line	2020-06-03 20:09:49 -07:00
wmi
Makefile