diff options
author | Kees Cook <keescook@chromium.org> | 2021-09-29 02:09:46 +0300 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2021-09-29 02:27:18 +0300 |
commit | 102acbacfd9a96d101abd96d1a7a5bf92b7c3e8e (patch) | |
tree | 18cfa723e40dbe24928faf0299bf0b90e8df9f43 /include/linux/filter.h | |
parent | 3d717fad5081b8e3bda76d86907fad95398cbde8 (diff) | |
download | linux-102acbacfd9a96d101abd96d1a7a5bf92b7c3e8e.tar.xz |
bpf: Replace callers of BPF_CAST_CALL with proper function typedef
In order to keep ahead of cases in the kernel where Control Flow
Integrity (CFI) may trip over function call casts, enabling
-Wcast-function-type is helpful. To that end, BPF_CAST_CALL causes
various warnings and is one of the last places in the kernel
triggering this warning.
For actual function calls, replace BPF_CAST_CALL() with a typedef, which
captures the same details about the given function pointers.
This change results in no object code difference.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://github.com/KSPP/linux/issues/20
Link: https://lore.kernel.org/lkml/CAEf4Bzb46=-J5Fxc3mMZ8JQPtK1uoE0q6+g6WPz53Cvx=CBEhw@mail.gmail.com
Link: https://lore.kernel.org/bpf/20210928230946.4062144-3-keescook@chromium.org
Diffstat (limited to 'include/linux/filter.h')
-rw-r--r-- | include/linux/filter.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 6c247663d4ce..47f80adbe744 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -360,11 +360,6 @@ static inline bool insn_is_zext(const struct bpf_insn *insn) .off = 0, \ .imm = TGT }) -/* Function call */ - -#define BPF_CAST_CALL(x) \ - ((u64 (*)(u64, u64, u64, u64, u64))(x)) - /* Convert function address to BPF immediate */ #define BPF_CALL_IMM(x) ((void *)(x) - (void *)__bpf_call_base) |