| Message ID | 20180802224710.29662-1-guro@fb.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] selftests/bpf: fix a typo in map in map test | expand |
On Thu, Aug 02, 2018 at 03:47:10PM -0700, Roman Gushchin wrote: > Commit fbeb1603bf4e ("bpf: verifier: MOV64 don't mark dst reg unbounded") > revealed a typo in commit fb30d4b71214 ("bpf: Add tests for map-in-map"): > BPF_MOV64_REG(BPF_REG_0, 0) was used instead of > BPF_MOV64_IMM(BPF_REG_0, 0). > > I've noticed the problem by running bpf kselftests. Thanks for the fix! FWIW, here is the verifier log: 11: (85) call bpf_map_lookup_elem#1 12: (bf) r0 = r0 13: (95) exit R0 leaks addr as return value Acked-by: Martin KaFai Lau <kafai@fb.com>
On 08/03/2018 12:47 AM, Roman Gushchin wrote: > Commit fbeb1603bf4e ("bpf: verifier: MOV64 don't mark dst reg unbounded") > revealed a typo in commit fb30d4b71214 ("bpf: Add tests for map-in-map"): > BPF_MOV64_REG(BPF_REG_0, 0) was used instead of > BPF_MOV64_IMM(BPF_REG_0, 0). > > I've noticed the problem by running bpf kselftests. > > Fixes: fb30d4b71214 ("bpf: Add tests for map-in-map") > Signed-off-by: Roman Gushchin <guro@fb.com> > Cc: Martin KaFai Lau <kafai@fb.com> > Cc: Arthur Fabre <afabre@cloudflare.com> > Cc: Daniel Borkmann <daniel@iogearbox.net> > Cc: Alexei Starovoitov <ast@kernel.org> Applied to bpf-next, thanks Roman!
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 4b5e03c25204..ac281ee771dd 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -7113,7 +7113,7 @@ static struct bpf_test tests[] = { BPF_MOV64_REG(BPF_REG_1, BPF_REG_0), BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem), - BPF_MOV64_REG(BPF_REG_0, 0), + BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(), }, .fixup_map_in_map = { 3 }, @@ -7136,7 +7136,7 @@ static struct bpf_test tests[] = { BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8), BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem), - BPF_MOV64_REG(BPF_REG_0, 0), + BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(), }, .fixup_map_in_map = { 3 }, @@ -7158,7 +7158,7 @@ static struct bpf_test tests[] = { BPF_MOV64_REG(BPF_REG_1, BPF_REG_0), BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem), - BPF_MOV64_REG(BPF_REG_0, 0), + BPF_MOV64_IMM(BPF_REG_0, 0), BPF_EXIT_INSN(), }, .fixup_map_in_map = { 3 },
Commit fbeb1603bf4e ("bpf: verifier: MOV64 don't mark dst reg unbounded") revealed a typo in commit fb30d4b71214 ("bpf: Add tests for map-in-map"): BPF_MOV64_REG(BPF_REG_0, 0) was used instead of BPF_MOV64_IMM(BPF_REG_0, 0). I've noticed the problem by running bpf kselftests. Fixes: fb30d4b71214 ("bpf: Add tests for map-in-map") Signed-off-by: Roman Gushchin <guro@fb.com> Cc: Martin KaFai Lau <kafai@fb.com> Cc: Arthur Fabre <afabre@cloudflare.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Alexei Starovoitov <ast@kernel.org> --- tools/testing/selftests/bpf/test_verifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)