Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2671d96 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Greg Kroah-Hartman
Browse files

bpf, selftests: Adjust few selftest result_unpriv outcomes 



commit 1bad6fd52be4ce12d207e2820ceb0f29ab31fc53 upstream.

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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
[OP: backport to 5.4, small context adjustment in stack_ptr.c]
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4892b4f3

tools/testing/selftests/bpf/verifier/stack_ptr.c

+0 −2
Original line number Diff line number Diff line
@@ -291,8 +291,6 @@ 
	BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_1, 0),

	BPF_EXIT_INSN(),

	},

	.result_unpriv = REJECT,

	.errstr_unpriv = "invalid stack off=0 size=1",

	.result = ACCEPT,

	.retval = 42,

},

tools/testing/selftests/bpf/verifier/value_ptr_arith.c

+0 −8
Original line number Diff line number Diff line
@@ -301,8 +301,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,

},

{
@@ -372,8 +370,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,

},

{
@@ -473,8 +469,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,

},

{
@@ -767,8 +761,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,

},

{