| From foo@baz Mon Sep 17 12:33:31 CEST 2018 |
| From: Roman Gushchin <guro@fb.com> |
| Date: Thu, 2 Aug 2018 15:47:10 -0700 |
| Subject: selftests/bpf: fix a typo in map in map test |
| |
| From: Roman Gushchin <guro@fb.com> |
| |
| [ Upstream commit 0069fb854364da79fd99236ea620affc8e1152d5 ] |
| |
| 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> |
| Acked-by: Martin KaFai Lau <kafai@fb.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/bpf/test_verifier.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/tools/testing/selftests/bpf/test_verifier.c |
| +++ b/tools/testing/selftests/bpf/test_verifier.c |
| @@ -5895,7 +5895,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 }, |
| @@ -5918,7 +5918,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 }, |
| @@ -5941,7 +5941,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 }, |
