diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2021-09-28 16:27:18 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-09-28 16:27:19 -0700 |
| commit | 72e1781a5de9e3ee804e24f7ce9a7dd85596fc51 (patch) | |
| tree | 18cfa723e40dbe24928faf0299bf0b90e8df9f43 /include/linux/bpf.h | |
| parent | bpftool: Avoid using "?: " in generated code (diff) | |
| parent | bpf: Replace callers of BPF_CAST_CALL with proper function typedef (diff) | |
| download | linux-dev-72e1781a5de9e3ee804e24f7ce9a7dd85596fc51.tar.xz linux-dev-72e1781a5de9e3ee804e24f7ce9a7dd85596fc51.zip | |
Merge branch 'bpf: Build with -Wcast-function-type'
Kees Cook says:
====================
Hi,
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, replace BPF_CAST_CALL() as it triggers warnings
with this option and is now one of the last places in the kernel in need
of fixing.
Thanks,
-Kees
v2:
- rebase to bpf-next
- add acks
v1: https://lore.kernel.org/lkml/20210927182700.2980499-1-keescook@chromium.org
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/bpf.h')
| -rw-r--r-- | include/linux/bpf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index b6c45a6cbbba..19735d59230a 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -48,6 +48,7 @@ extern struct idr btf_idr; extern spinlock_t btf_idr_lock; extern struct kobject *btf_kobj; +typedef u64 (*bpf_callback_t)(u64, u64, u64, u64, u64); typedef int (*bpf_iter_init_seq_priv_t)(void *private_data, struct bpf_iter_aux_info *aux); typedef void (*bpf_iter_fini_seq_priv_t)(void *private_data); @@ -142,7 +143,8 @@ struct bpf_map_ops { int (*map_set_for_each_callback_args)(struct bpf_verifier_env *env, struct bpf_func_state *caller, struct bpf_func_state *callee); - int (*map_for_each_callback)(struct bpf_map *map, void *callback_fn, + int (*map_for_each_callback)(struct bpf_map *map, + bpf_callback_t callback_fn, void *callback_ctx, u64 flags); /* BTF name and id of struct allocated by map_alloc */ |