diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2018-06-02 23:06:33 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-06-03 16:42:06 +0200 |
| commit | 3fe2867cdf088ffb2dc5aed6cdcf757b4c62476c (patch) | |
| tree | bfd5eed21c3a7cce3a4ff4076c5dda283f451c40 | |
| parent | bpf: add also cbpf long jump test cases with heavy expansion (diff) | |
| download | linux-3fe2867cdf088ffb2dc5aed6cdcf757b4c62476c.tar.xz linux-3fe2867cdf088ffb2dc5aed6cdcf757b4c62476c.zip | |
bpf: fixup error message from gpl helpers on license mismatch
Stating 'proprietary program' in the error is just silly since it
can also be a different open source license than that which is just
not compatible.
Reference: https://twitter.com/majek04/status/998531268039102465
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 1fd9667b29f1..4f4786ea2296 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2462,7 +2462,7 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn /* eBPF programs must be GPL compatible to use GPL-ed functions */ if (!env->prog->gpl_compatible && fn->gpl_only) { - verbose(env, "cannot call GPL only function from proprietary program\n"); + verbose(env, "cannot call GPL-restricted function from non-GPL compatible program\n"); return -EINVAL; } |