Commit a680cb3d authored by Andrei Matei's avatar Andrei Matei Committed by Alexei Starovoitov
Browse files

selftest/bpf: Adjust expected verifier errors 



The verifier errors around stack accesses have changed slightly in the
previous commit (generally for the better).

Signed-off-by: default avatarAndrei Matei <andreimatei1@gmail.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210207011027.676572-3-andreimatei1@gmail.com
parent 01f810ac

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	BPF_ST_MEM(BPF_DW, BPF_REG_10, 8, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid stack",

	.errstr = "invalid write to stack",

	.result = REJECT,

},

{

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

+2 −2
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ 
	.prog_type = BPF_PROG_TYPE_XDP,

	.fixup_map_hash_8b = { 23 },

	.result = REJECT,

	.errstr = "invalid read from stack off -16+0 size 8",

	.errstr = "invalid read from stack R7 off=-16 size=8",

},

{

	"calls: two calls that receive map_value via arg=ptr_stack_of_caller. test1",
@@ -1958,7 +1958,7 @@ 
	BPF_EXIT_INSN(),

	},

	.fixup_map_hash_48b = { 6 },

	.errstr = "invalid indirect read from stack off -8+0 size 8",

	.errstr = "invalid indirect read from stack R2 off -8+0 size 8",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_XDP,

},

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

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
	BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid stack type R1 off=-48 access_size=58",

	.errstr = "invalid indirect access to stack R1 off=-48 size=58",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},
@@ -54,7 +54,7 @@ 
	BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid stack type R1 off=-48 access_size=58",

	.errstr = "invalid indirect access to stack R1 off=-48 size=58",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

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

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
	BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid indirect read from stack off -64+0 size 64",

	.errstr = "invalid indirect read from stack R1 off -64+0 size 64",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},
@@ -59,7 +59,7 @@ 
	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid stack type R1 off=-64 access_size=65",

	.errstr = "invalid indirect access to stack R1 off=-64 size=65",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},
@@ -136,7 +136,7 @@ 
	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid stack type R1 off=-64 access_size=65",

	.errstr = "invalid indirect access to stack R1 off=-64 size=65",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},
@@ -156,7 +156,7 @@ 
	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid stack type R1 off=-64 access_size=65",

	.errstr = "invalid indirect access to stack R1 off=-64 size=65",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},
@@ -194,7 +194,7 @@ 
	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid indirect read from stack off -64+0 size 64",

	.errstr = "invalid indirect read from stack R1 off -64+0 size 64",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},
@@ -584,7 +584,7 @@ 
	BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_10, -16),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid indirect read from stack off -64+32 size 64",

	.errstr = "invalid indirect read from stack R1 off -64+32 size 64",

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

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

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
	},

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,

	.errstr = "invalid indirect read from stack off -16+0 size 8",

	.errstr = "invalid indirect read from stack R4 off -16+0 size 8",

},

{

	"ARG_PTR_TO_LONG half-uninitialized",
@@ -59,7 +59,7 @@ 
	},

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,

	.errstr = "invalid indirect read from stack off -16+4 size 8",

	.errstr = "invalid indirect read from stack R4 off -16+4 size 8",

},

{

	"ARG_PTR_TO_LONG misaligned",
@@ -125,7 +125,7 @@ 
	},

	.result = REJECT,

	.prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,

	.errstr = "invalid stack type R4 off=-4 access_size=8",

	.errstr = "invalid indirect access to stack R4 off=-4 size=8",

},

{

	"ARG_PTR_TO_LONG initialized",