projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be08815
)
bpf: fixup error message from gpl helpers on license mismatch
author
Daniel Borkmann
<
[email protected]
>
Sat, 2 Jun 2018 21:06:33 +0000
(23:06 +0200)
committer
Alexei Starovoitov
<
[email protected]
>
Sun, 3 Jun 2018 14:42:06 +0000
(07:42 -0700)
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 <
[email protected]
>
Acked-by: Alexei Starovoitov <
[email protected]
>
Acked-by: Jesper Dangaard Brouer <
[email protected]
>
Acked-by: Song Liu <
[email protected]
>
Signed-off-by: Alexei Starovoitov <
[email protected]
>
kernel/bpf/verifier.c
patch
|
blob
|
history
diff --git
a/kernel/bpf/verifier.c
b/kernel/bpf/verifier.c
index 1fd9667b29f1a93998d808bcb6a307ff1412b1d7..4f4786ea2296ed794fe929b4037376d996945fd6 100644
(file)
--- 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;
}