Commit 15ab09bd authored Oct 28, 2019 by Alexei Starovoitov Committed by Daniel Borkmann Oct 30, 2019

bpf: Enforce 'return 0' in BTF-enabled raw_tp programs



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

parent a566e35f

kernel/bpf/verifier.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message