diff options
Diffstat (limited to 'bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch')
| -rw-r--r-- | bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch b/bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch new file mode 100644 index 000000000..0b8304e7f --- /dev/null +++ b/bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch @@ -0,0 +1,53 @@ +From 6b5ca133b9fbd57f0ca4acd7999c4e9a93e702be Mon Sep 17 00:00:00 2001 +From: Daniel Borkmann <daniel@iogearbox.net> +Date: Fri, 24 Jan 2020 14:21:14 +0000 +Subject: bpf: update jmp32 test cases to fix range bound deduction + +From: Daniel Borkmann <daniel@iogearbox.net> + +[ no upstream commit ] + +Since commit f2d67fec0b43 ("bpf: Undo incorrect __reg_bound_offset32 handling") +has been backported to stable, we also need to update related test cases that +started to (expectedly) fail on stable. Given the functionality has been reverted +we need to move the result to REJECT. + +Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> +Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + tools/testing/selftests/bpf/verifier/jmp32.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +--- a/tools/testing/selftests/bpf/verifier/jmp32.c ++++ b/tools/testing/selftests/bpf/verifier/jmp32.c +@@ -768,7 +768,8 @@ + }, + .prog_type = BPF_PROG_TYPE_SCHED_CLS, + .fixup_map_hash_48b = { 4 }, +- .result = ACCEPT, ++ .result = REJECT, ++ .errstr = "R8 unbounded memory access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, + }, + { +@@ -796,7 +797,8 @@ + }, + .prog_type = BPF_PROG_TYPE_SCHED_CLS, + .fixup_map_hash_48b = { 4 }, +- .result = ACCEPT, ++ .result = REJECT, ++ .errstr = "R8 unbounded memory access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, + }, + { +@@ -824,6 +826,7 @@ + }, + .prog_type = BPF_PROG_TYPE_SCHED_CLS, + .fixup_map_hash_48b = { 4 }, +- .result = ACCEPT, ++ .result = REJECT, ++ .errstr = "R8 unbounded memory access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, + }, |