From: Jiri Olsa <jolsa@redhat.com>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: davem@davemloft.net, 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 20:08:05 +0200 [thread overview]
Message-ID: <20200731180805.GA27597@krava> (raw)
In-Reply-To: <03545f38-c01a-faeb-adab-a0a471ff9fc3@iogearbox.net>
On Fri, Jul 31, 2020 at 06:12:48PM +0200, Daniel Borkmann wrote:
SNIP
> > > 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).
> >
> > we'll loose the bpf_log message, but I'm fine with that ;-) looks good
>
> Checking again on the fix, even though it was only triggered by syzkaller
> so far, I think it's also possible if users don't have BTF debug data set
> in the Kconfig but use a helper that expects it, so agree, lets re-add the
> log in this case:
>
> 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)
> return -EINVAL;
> if (!btf_vmlinux) {
> bpf_log(log, "btf_vmlinux doesn't exist\n");
> return -EINVAL;
> }
> id = fn->btf_id[arg];
> if (!id || id > btf_vmlinux->nr_types)
> return -EINVAL;
> return id;
> }
ok, looks good
jirka
next prev parent reply other threads:[~2020-07-31 18:08 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 [this message]
2020-08-01 0:20 ` David Miller
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=20200731180805.GA27597@krava \
--to=jolsa@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.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).