From: Andrii Nakryiko Date: Tue, 12 Jan 2021 07:55:15 +0000 (-0800) Subject: bpf: Avoid warning when re-casting __bpf_call_base into __bpf_call_base_args X-Git-Tag: v4.19.178~213 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d7fdbb979fa84cd63c3efb3c49ff7101774da73;p=thirdparty%2Fkernel%2Fstable.git bpf: Avoid warning when re-casting __bpf_call_base into __bpf_call_base_args [ Upstream commit 6943c2b05bf09fd5c5729f7d7d803bf3f126cb9a ] BPF interpreter uses extra input argument, so re-casts __bpf_call_base into __bpf_call_base_args. Avoid compiler warning about incompatible function prototypes by casting to void * first. Fixes: 1ea47e01ad6e ("bpf: add support for bpf_call to interpreter") Reported-by: kernel test robot Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20210112075520.4103414-3-andrii@kernel.org Signed-off-by: Sasha Levin --- diff --git a/include/linux/filter.h b/include/linux/filter.h index d61dc72ebb960..117f9380069a8 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -746,7 +746,7 @@ void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp); u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5); #define __bpf_call_base_args \ ((u64 (*)(u64, u64, u64, u64, u64, const struct bpf_insn *)) \ - __bpf_call_base) + (void *)__bpf_call_base) struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog); void bpf_jit_compile(struct bpf_prog *prog);