]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bpf: update jmp32 test cases to fix range bound deduction
authorDaniel Borkmann <daniel@iogearbox.net>
Fri, 24 Jan 2020 14:21:14 +0000 (14:21 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Apr 2020 06:02:30 +0000 (08:02 +0200)
[ 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

index bd5cae4a7f7338d182af5fa41f95daa72fec8dc3..79eeed6029f5f5f9df30b630361f323a7b379a89 100644 (file)
        },
        .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,
 },
 {
        },
        .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,
 },
 {
        },
        .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,
 },