lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 31 Jul 2020 17:20:13 -0700 (PDT) From: David Miller <davem@...emloft.net> To: daniel@...earbox.net Cc: kuba@...nel.org, ast@...nel.org, jolsa@...nel.org, netdev@...r.kernel.org, bpf@...r.kernel.org Subject: Re: pull-request: bpf 2020-07-31 From: Daniel Borkmann <daniel@...earbox.net> Date: Fri, 31 Jul 2020 15:51:45 +0200 > 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. > > Please consider pulling these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Pulled. > Note that when net gets merged into net-next later on, there is a small > merge conflict in kernel/bpf/btf.c between commit 5b801dfb7feb ("bpf: Fix > NULL pointer dereference in __btf_resolve_helper_id()") from the bpf tree > and commit 138b9a0511c7 ("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: ... Noted, thank you.
Powered by blists - more mailing lists