bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Frank van der Linden <fllinden@amazon.com>
To: <stable@vger.kernel.org>
Cc: <bpf@vger.kernel.org>, <ast@kernel.org>, <daniel@iogearbox.net>,
	<yhs@fb.com>, <john.fastabend@gmail.com>, <samjonas@amazon.com>
Subject: [PATCH 4.14 14/15] selftests/bpf: fix test_align
Date: Sat, 1 May 2021 04:30:13 +0000	[thread overview]
Message-ID: <20210501043014.33300-15-fllinden@amazon.com> (raw)
In-Reply-To: <20210501043014.33300-1-fllinden@amazon.com>

From: Alexei Starovoitov <ast@fb.com>

Upstream commit 2b36047e7889b7efee22c11e17f035f721855731

since commit 82abbf8d2fc4 the verifier rejects the bit-wise
arithmetic on pointers earlier.
The test 'dubious pointer arithmetic' now has less output to match on.
Adjust it.

Fixes: 82abbf8d2fc4 ("bpf: do not allow root to mangle valid pointers")
Reported-by: kernel test robot <xiaolong.ye@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
 tools/testing/selftests/bpf/test_align.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_align.c b/tools/testing/selftests/bpf/test_align.c
index 8591c89c0828..471bbbdb94db 100644
--- a/tools/testing/selftests/bpf/test_align.c
+++ b/tools/testing/selftests/bpf/test_align.c
@@ -474,27 +474,7 @@ static struct bpf_align_test tests[] = {
 		.result = REJECT,
 		.matches = {
 			{4, "R5=pkt(id=0,off=0,r=0,imm=0)"},
-			/* ptr & 0x40 == either 0 or 0x40 */
-			{5, "R5=inv(id=0,umax_value=64,var_off=(0x0; 0x40))"},
-			/* ptr << 2 == unknown, (4n) */
-			{7, "R5=inv(id=0,smax_value=9223372036854775804,umax_value=18446744073709551612,var_off=(0x0; 0xfffffffffffffffc))"},
-			/* (4n) + 14 == (4n+2).  We blow our bounds, because
-			 * the add could overflow.
-			 */
-			{8, "R5=inv(id=0,var_off=(0x2; 0xfffffffffffffffc))"},
-			/* Checked s>=0 */
-			{10, "R5=inv(id=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
-			/* packet pointer + nonnegative (4n+2) */
-			{12, "R6=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
-			{14, "R4=pkt(id=1,off=4,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
-			/* NET_IP_ALIGN + (4n+2) == (4n), alignment is fine.
-			 * We checked the bounds, but it might have been able
-			 * to overflow if the packet pointer started in the
-			 * upper half of the address space.
-			 * So we did not get a 'range' on R6, and the access
-			 * attempt will fail.
-			 */
-			{16, "R6=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"},
+			/* R5 bitwise operator &= on pointer prohibited */
 		}
 	},
 	{
-- 
2.23.3


  parent reply	other threads:[~2021-05-01  4:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-01  4:29 [PATCH 4.14 00/15] fix backports, add CVE-2021-29155 fixes Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 01/15] bpf: Fix backport of "bpf: restrict unknown scalars of mixed signed bounds for unprivileged" Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 02/15] bpf: fix up selftests after backports were fixed Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 03/15] bpf, selftests: Fix up some test_verifier cases for unprivileged Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 04/15] bpf: Move off_reg into sanitize_ptr_alu Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 05/15] bpf: Ensure off_reg has no mixed signed bounds for all types Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 06/15] bpf: Rework ptr_limit into alu_limit and add common error path Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 07/15] bpf: Improve verifier error messages for users Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 08/15] bpf: Refactor and streamline bounds check into helper Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 09/15] bpf: Move sanitize_val_alu out of op switch Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 10/15] bpf: Tighten speculative pointer arithmetic mask Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 11/15] bpf: Update selftests to reflect new error states Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 12/15] bpf: do not allow root to mangle valid pointers Frank van der Linden
2021-05-01  4:30 ` [PATCH 4.14 13/15] bpf/verifier: disallow pointer subtraction Frank van der Linden
2021-05-01  4:30 ` Frank van der Linden [this message]
2021-05-01  4:30 ` [PATCH 4.14 15/15] selftests/bpf: make 'dubious pointer arithmetic' test useful Frank van der Linden

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=20210501043014.33300-15-fllinden@amazon.com \
    --to=fllinden@amazon.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --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).