From: Ovidiu Panait <ovidiu.panait@windriver.com>
To: stable@vger.kernel.org
Cc: fllinden@amazon.com, bpf@vger.kernel.org, ast@kernel.org,
daniel@iogearbox.net, yhs@fb.com, john.fastabend@gmail.com,
samjonas@amazon.com
Subject: [PATCH 4.19 04/12] selftests/bpf: add selftest part of "bpf: improve verifier branch analysis"
Date: Thu, 27 May 2021 20:37:24 +0300 [thread overview]
Message-ID: <20210527173732.20860-5-ovidiu.panait@windriver.com> (raw)
In-Reply-To: <20210527173732.20860-1-ovidiu.panait@windriver.com>
Backport the missing selftest part of commit 7da6cd690c43 ("bpf: improve
verifier branch analysis") in order to fix the following test_verifier
failures:
...
Unexpected success to load!
0: (b7) r0 = 0
1: (75) if r0 s>= 0x0 goto pc+1
3: (95) exit
processed 3 insns (limit 131072), stack depth 0
Unexpected success to load!
0: (b7) r0 = 0
1: (75) if r0 s>= 0x0 goto pc+1
3: (95) exit
processed 3 insns (limit 131072), stack depth 0
...
The changesets apply with a minor context difference.
Fixes: 7da6cd690c43 ("bpf: improve verifier branch analysis")
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
tools/testing/selftests/bpf/test_verifier.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index fdc093f29818..a34552aadc12 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -7867,7 +7867,7 @@ static struct bpf_test tests[] = {
BPF_JMP_IMM(BPF_JA, 0, 0, -7),
},
.fixup_map1 = { 4 },
- .errstr = "R0 invalid mem access 'inv'",
+ .errstr = "unbounded min value",
.errstr_unpriv = "R1 has unknown scalar with mixed signed bounds",
.result = REJECT,
},
@@ -9850,7 +9850,7 @@ static struct bpf_test tests[] = {
"check deducing bounds from const, 5",
.insns = {
BPF_MOV64_IMM(BPF_REG_0, 0),
- BPF_JMP_IMM(BPF_JSGE, BPF_REG_0, 0, 1),
+ BPF_JMP_IMM(BPF_JSGE, BPF_REG_0, 1, 1),
BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1),
BPF_EXIT_INSN(),
},
--
2.17.1
next prev parent reply other threads:[~2021-05-27 17:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 17:37 [PATCH 4.19 00/12] bpf: fix verifier selftests, add CVE-2021-29155 fixes Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 01/12] bpf: fix up selftests after backports were fixed Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 02/12] bpf, selftests: Fix up some test_verifier cases for unprivileged Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 03/12] selftests/bpf: Test narrow loads with off > 0 in test_verifier Ovidiu Panait
2021-05-27 17:37 ` Ovidiu Panait [this message]
2021-05-27 17:37 ` [PATCH 4.19 05/12] bpf: Move off_reg into sanitize_ptr_alu Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 06/12] bpf: Ensure off_reg has no mixed signed bounds for all types Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 07/12] bpf: Rework ptr_limit into alu_limit and add common error path Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 08/12] bpf: Improve verifier error messages for users Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 09/12] bpf: Refactor and streamline bounds check into helper Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 10/12] bpf: Move sanitize_val_alu out of op switch Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 11/12] bpf: Tighten speculative pointer arithmetic mask Ovidiu Panait
2021-05-27 17:37 ` [PATCH 4.19 12/12] bpf: Update selftests to reflect new error states Ovidiu Panait
2021-05-27 19:44 ` [PATCH 4.19 00/12] bpf: fix verifier selftests, add CVE-2021-29155 fixes Daniel Borkmann
2021-05-27 20:31 ` Frank van der Linden
2021-05-28 10:12 ` Tiezhu Yang
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=20210527173732.20860-5-ovidiu.panait@windriver.com \
--to=ovidiu.panait@windriver.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=fllinden@amazon.com \
--cc=john.fastabend@gmail.com \
--cc=samjonas@amazon.com \
--cc=stable@vger.kernel.org \
--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).