lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 035/247] bpf: Avoid warning when re-casting __bpf_call_base into __bpf_call_base_args
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ 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 <lkp@intel.com>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Acked-by: Yonghong Song <yhs@fb.com>
    Link: https://lore.kernel.org/bpf/20210112075520.4103414-3-andrii@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/filter.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-01 21:00    [W:2.859 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site