From: Paul Chaignon <paul.chaignon@orange.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: Xiao Han <xiao.han@orange.com>,
paul.chaignon@gmail.com, Martin KaFai Lau <kafai@fb.com>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>
Subject: [PATCH bpf] bpf: report verifier bugs as warnings
Date: Tue, 2 Apr 2019 13:58:14 +0200 [thread overview]
Message-ID: <20190402115811.GA6303@Nover> (raw)
Three checks for verifier bugs were introduced in commit f4d7e40 ("bpf:
introduce function calls (verification)"). The bugs were reported as
incorrect programs instead of kernel warnings as the present patch
implements.
Signed-off-by: Paul Chaignon <paul.chaignon@orange.com>
---
kernel/bpf/verifier.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 87221fda1321..12499e72b0d5 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -1145,9 +1145,9 @@ static int mark_reg_read(struct bpf_verifier_env *env,
if (writes && state->live & REG_LIVE_WRITTEN)
break;
if (parent->live & REG_LIVE_DONE) {
- verbose(env, "verifier BUG type %s var_off %lld off %d\n",
- reg_type_str[parent->type],
- parent->var_off.value, parent->off);
+ WARN_ONCE(1, "verifier bug type %s var_off %lld off %d\n",
+ reg_type_str[parent->type],
+ parent->var_off.value, parent->off);
return -EFAULT;
}
/* ... then we depend on parent's value */
@@ -2888,15 +2888,15 @@ static int check_func_call(struct bpf_verifier_env *env, struct bpf_insn *insn,
target_insn = *insn_idx + insn->imm;
subprog = find_subprog(env, target_insn + 1);
if (subprog < 0) {
- verbose(env, "verifier bug. No program starts at insn %d\n",
- target_insn + 1);
+ WARN_ONCE(1, "verifier bug. No program starts at insn %d\n",
+ target_insn + 1);
return -EFAULT;
}
caller = state->frame[state->curframe];
if (state->frame[state->curframe + 1]) {
- verbose(env, "verifier bug. Frame %d already allocated\n",
- state->curframe + 1);
+ WARN_ONCE(1, "verifier bug. Frame %d already allocated\n",
+ state->curframe + 1);
return -EFAULT;
}
--
2.17.1
next reply other threads:[~2019-04-02 11:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-02 11:58 Paul Chaignon [this message]
2019-04-02 14:37 ` [PATCH bpf] bpf: report verifier bugs as warnings Daniel Borkmann
2019-04-02 17:39 ` Alexei Starovoitov
2019-04-03 14:40 ` Paul Chaignon
2019-04-03 15:52 ` Edward Cree
2019-04-03 17:30 ` Alexei Starovoitov
2019-04-03 20:24 ` Edward Cree
2019-04-03 22:41 ` Daniel Borkmann
2019-04-04 17:45 ` Alexei Starovoitov
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=20190402115811.GA6303@Nover \
--to=paul.chaignon@orange.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=paul.chaignon@gmail.com \
--cc=songliubraving@fb.com \
--cc=xiao.han@orange.com \
--cc=yhs@fb.com \
/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).