From: David Miller <davem@davemloft.net>
To: daniel@iogearbox.net
Cc: kuba@kernel.org, ast@kernel.org, jolsa@kernel.org,
netdev@vger.kernel.org, bpf@vger.kernel.org
Subject: Re: pull-request: bpf 2020-07-31
Date: Fri, 31 Jul 2020 17:20:13 -0700 (PDT) [thread overview]
Message-ID: <20200731.172013.46612671169780905.davem@davemloft.net> (raw)
In-Reply-To: <20200731135145.15003-1-daniel@iogearbox.net>
From: Daniel Borkmann <daniel@iogearbox.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.
prev parent reply other threads:[~2020-08-01 0:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 13:51 pull-request: bpf 2020-07-31 Daniel Borkmann
2020-07-31 15:24 ` Jiri Olsa
2020-07-31 16:12 ` Daniel Borkmann
2020-07-31 18:08 ` Jiri Olsa
2020-08-01 0:20 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200731.172013.46612671169780905.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).