Commit bf88a80a authored by Hao Luo's avatar Hao Luo Committed by Alexei Starovoitov

selftests/bpf: Fix test_verifier after introducing resolve_pseudo_ldimm64

Commit 4976b718 ("bpf: Introduce pseudo_btf_id") switched
the order of check_subprogs() and resolve_pseudo_ldimm() in
the verifier. Now an empty prog expects to see the error "last
insn is not an the prog of a single invalid ldimm exit or jmp"
instead, because the check for subprogs comes first. It's now
pointless to validate that half of ldimm64 won't be the last
instruction.

Tested:
 # ./test_verifier
 Summary: 1129 PASSED, 537 SKIPPED, 0 FAILED
 and the full set of bpf selftests.

Fixes: 4976b718 ("bpf: Introduce pseudo_btf_id")
Signed-off-by: default avatarHao Luo <haoluo@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201007022857.2791884-1-haoluo@google.com
parent 67ed3755
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"empty prog", "empty prog",
.insns = { .insns = {
}, },
.errstr = "unknown opcode 00", .errstr = "last insn is not an exit or jmp",
.result = REJECT, .result = REJECT,
}, },
{ {
......
...@@ -50,14 +50,6 @@ ...@@ -50,14 +50,6 @@
.errstr = "invalid bpf_ld_imm64 insn", .errstr = "invalid bpf_ld_imm64 insn",
.result = REJECT, .result = REJECT,
}, },
{
"test5 ld_imm64",
.insns = {
BPF_RAW_INSN(BPF_LD | BPF_IMM | BPF_DW, 0, 0, 0, 0),
},
.errstr = "invalid bpf_ld_imm64 insn",
.result = REJECT,
},
{ {
"test6 ld_imm64", "test6 ld_imm64",
.insns = { .insns = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment