bpf: Enforce 'return 0' in BTF-enabled raw_tp programs
authorAlexei Starovoitov <ast@kernel.org>
Tue, 29 Oct 2019 03:24:26 +0000 (20:24 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 30 Oct 2019 15:22:55 +0000 (16:22 +0100)
The return value of raw_tp programs is ignored by __bpf_trace_run()
that calls them. The verifier also allows any value to be returned.
For BTF-enabled raw_tp lets enforce 'return 0', so that return value
can be used for something in the future.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191029032426.1206762-1-ast@kernel.org
kernel/bpf/verifier.c

index c59778c0fc4db6552ea13c349467989436e45434..6b0de04f8b91860827eb88a08147ed0040218ae5 100644 (file)
@@ -6279,6 +6279,11 @@ static int check_return_code(struct bpf_verifier_env *env)
        case BPF_PROG_TYPE_CGROUP_SYSCTL:
        case BPF_PROG_TYPE_CGROUP_SOCKOPT:
                break;
+       case BPF_PROG_TYPE_RAW_TRACEPOINT:
+               if (!env->prog->aux->attach_btf_id)
+                       return 0;
+               range = tnum_const(0);
+               break;
        default:
                return 0;
        }