| From 09178b949179888852883c47c72867889e7057e7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 4 May 2021 08:58:25 +0000 |
| Subject: bpf, selftests: Adjust few selftest result_unpriv outcomes |
| |
| From: Daniel Borkmann <daniel@iogearbox.net> |
| |
| [ Upstream commit 1bad6fd52be4ce12d207e2820ceb0f29ab31fc53 ] |
| |
| Given we don't need to simulate the speculative domain for registers with |
| immediates anymore since the verifier uses direct imm-based rewrites instead |
| of having to mask, we can also lift a few cases that were previously rejected. |
| |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Acked-by: Alexei Starovoitov <ast@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/bpf/verifier/stack_ptr.c | 2 -- |
| tools/testing/selftests/bpf/verifier/value_ptr_arith.c | 8 -------- |
| 2 files changed, 10 deletions(-) |
| |
| diff --git a/tools/testing/selftests/bpf/verifier/stack_ptr.c b/tools/testing/selftests/bpf/verifier/stack_ptr.c |
| index 07eaa04412ae..8ab94d65f3d5 100644 |
| --- a/tools/testing/selftests/bpf/verifier/stack_ptr.c |
| +++ b/tools/testing/selftests/bpf/verifier/stack_ptr.c |
| @@ -295,8 +295,6 @@ |
| BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_1, 0), |
| BPF_EXIT_INSN(), |
| }, |
| - .result_unpriv = REJECT, |
| - .errstr_unpriv = "invalid write to stack R1 off=0 size=1", |
| .result = ACCEPT, |
| .retval = 42, |
| }, |
| diff --git a/tools/testing/selftests/bpf/verifier/value_ptr_arith.c b/tools/testing/selftests/bpf/verifier/value_ptr_arith.c |
| index e5913fd3b903..7ae2859d495c 100644 |
| --- a/tools/testing/selftests/bpf/verifier/value_ptr_arith.c |
| +++ b/tools/testing/selftests/bpf/verifier/value_ptr_arith.c |
| @@ -300,8 +300,6 @@ |
| }, |
| .fixup_map_array_48b = { 3 }, |
| .result = ACCEPT, |
| - .result_unpriv = REJECT, |
| - .errstr_unpriv = "R0 pointer arithmetic of map value goes out of range", |
| .retval = 1, |
| }, |
| { |
| @@ -371,8 +369,6 @@ |
| }, |
| .fixup_map_array_48b = { 3 }, |
| .result = ACCEPT, |
| - .result_unpriv = REJECT, |
| - .errstr_unpriv = "R0 pointer arithmetic of map value goes out of range", |
| .retval = 1, |
| }, |
| { |
| @@ -472,8 +468,6 @@ |
| }, |
| .fixup_map_array_48b = { 3 }, |
| .result = ACCEPT, |
| - .result_unpriv = REJECT, |
| - .errstr_unpriv = "R0 pointer arithmetic of map value goes out of range", |
| .retval = 1, |
| }, |
| { |
| @@ -766,8 +760,6 @@ |
| }, |
| .fixup_map_array_48b = { 3 }, |
| .result = ACCEPT, |
| - .result_unpriv = REJECT, |
| - .errstr_unpriv = "R0 pointer arithmetic of map value goes out of range", |
| .retval = 1, |
| }, |
| { |
| -- |
| 2.30.2 |
| |